D7970: crecord: fix a concatenation of bytes and str on py3
spectral (Kyle Lippincott)
phabricator at mercurial-scm.org
Wed Jan 22 18:04:43 UTC 2020
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D7970
AFFECTED FILES
mercurial/crecord.py
CHANGE DETAILS
diff --git a/mercurial/crecord.py b/mercurial/crecord.py
--- a/mercurial/crecord.py
+++ b/mercurial/crecord.py
@@ -24,6 +24,7 @@
encoding,
error,
patch as patchmod,
+ pycompat,
scmutil,
util,
)
@@ -1113,7 +1114,7 @@
# strip \n, and convert control characters to ^[char] representation
text = re.sub(
br'[\x00-\x08\x0a-\x1f]',
- lambda m: b'^' + chr(ord(m.group()) + 64),
+ lambda m: b'^' + pycompat.sysbytes(chr(ord(m.group()) + 64)),
text.strip(b'\n'),
)
To: spectral, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list