D4733: py3: cast exception to bytes
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Tue Sep 25 12:13:23 EDT 2018
indygreg updated this revision to Diff 11350.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4733?vs=11343&id=11350
REVISION DETAIL
https://phab.mercurial-scm.org/D4733
AFFECTED FILES
mercurial/wireprotoframing.py
CHANGE DETAILS
diff --git a/mercurial/wireprotoframing.py b/mercurial/wireprotoframing.py
--- a/mercurial/wireprotoframing.py
+++ b/mercurial/wireprotoframing.py
@@ -21,6 +21,7 @@
from . import (
encoding,
error,
+ pycompat,
util,
)
from .utils import (
@@ -827,9 +828,10 @@
break
except Exception as e:
- for frame in createerrorframe(stream, requestid,
- '%s' % e,
- errtype='server'):
+ for frame in createerrorframe(
+ stream, requestid, '%s' % stringutil.forcebytestr(e),
+ errtype='server'):
+
yield frame
break
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list