# HG changeset patch
# User Kyle Lippincott <spectral@google.com>
# Date 1579655734 28800
# Node ID ae596fac8ba072823ca9548b5360caa32a5d4840
# Parent  e96ed3a61899f3efec359a078b4382563d391559
crecord: fix a concatenation of bytes and str on py3

Differential Revision: https://phab.mercurial-scm.org/D7970

diff -r e96ed3a61899 -r ae596fac8ba0 mercurial/crecord.py
--- a/mercurial/crecord.py	Wed Jan 22 14:11:11 2020 -0500
+++ b/mercurial/crecord.py	Tue Jan 21 17:15:34 2020 -0800
@@ -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'),
         )