This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4731

py3: cast exception to bytes
ClosedPublic

Authored by indygreg on Sep 24 2018, 11:32 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG69b4a5b89dc5: py3: cast exception to bytes
Summary

This was raising a TypeError on Python 3 and preventing most (all?)
wireprotov2 commands from working.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Sep 24 2018, 11:32 PM
yuja added a subscriber: yuja.Sep 25 2018, 9:22 AM

@@ -319,7 +319,8 @@

except Exception as e:
    action, meta = reactor.onservererror(
        outstream, command['requestid'],
  • _('exception when invoking command: %s') % e)

+ _('exception when invoking command: %s') %
+ pycompat.sysbytes(str(e)))

Nit: stringutil.forcebytestr(e) is better since it can handle platform
strings.

indygreg updated this revision to Diff 11349.Sep 25 2018, 12:13 PM
Closed by commit rHG69b4a5b89dc5: py3: cast exception to bytes (authored by indygreg). · Explain WhySep 26 2018, 7:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotov2server.py (4 lines)

Diff 11369

mercurial/wireprotov2server.py

pycompat, pycompat,
streamclone, streamclone,
util, util,
wireprotoframing, wireprotoframing,
wireprototypes, wireprototypes,
) )
from .utils import ( from .utils import (
interfaceutil, interfaceutil,
stringutil,
) )
FRAMINGTYPE = b'application/mercurial-exp-framing-0005' FRAMINGTYPE = b'application/mercurial-exp-framing-0005'
HTTP_WIREPROTO_V2 = wireprototypes.HTTP_WIREPROTO_V2 HTTP_WIREPROTO_V2 = wireprototypes.HTTP_WIREPROTO_V2
COMMANDS = wireprototypes.commanddict() COMMANDS = wireprototypes.commanddict()
except error.WireprotoCommandError as e: except error.WireprotoCommandError as e:
action, meta = reactor.oncommanderror( action, meta = reactor.oncommanderror(
outstream, command['requestid'], e.message, e.messageargs) outstream, command['requestid'], e.message, e.messageargs)
except Exception as e: except Exception as e:
action, meta = reactor.onservererror( action, meta = reactor.onservererror(
outstream, command['requestid'], outstream, command['requestid'],
_('exception when invoking command: %s') % e) _('exception when invoking command: %s') %
stringutil.forcebytestr(e))
if action == 'sendframes': if action == 'sendframes':
res.setbodygen(meta['framegen']) res.setbodygen(meta['framegen'])
return True return True
elif action == 'noop': elif action == 'noop':
return False return False
else: else:
raise error.ProgrammingError('unhandled event from reactor: %s' % raise error.ProgrammingError('unhandled event from reactor: %s' %