# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1489282758 -19800 # Node ID 1c3352d7eaf24533ad52d4b8a024211e9189fb0b # Parent 0bd32d7c9002836eeaebe037676c7e91dd0d756c minirst: make encoding.encoding unicodes to pass into encode() and decode() diff -r 0bd32d7c9002 -r 1c3352d7eaf2 mercurial/minirst.py --- a/mercurial/minirst.py Sun Mar 12 06:59:37 2017 +0530 +++ b/mercurial/minirst.py Sun Mar 12 07:09:18 2017 +0530 @@ -26,6 +26,7 @@ from .i18n import _ from . import ( encoding, + pycompat, util, ) @@ -59,10 +60,10 @@ # ASCII characters other than control/alphabet/digit as a part of # multi-bytes characters, so direct replacing with such characters # on strings in local encoding causes invalid byte sequences. - utext = text.decode(encoding.encoding) + utext = text.decode(pycompat.sysstr(encoding.encoding)) for f, t in substs: utext = utext.replace(f.decode("ascii"), t.decode("ascii")) - return utext.encode(encoding.encoding) + return utext.encode(pycompat.sysstr(encoding.encoding)) _blockre = re.compile(br"\n(?:\s*\n)+")