# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1489284313 -19800 # Node ID a9a28ca17615c5d211422f56159552cacb4e15ef # Parent ec78316758678fdf9ccddbb9efb23d6259e2b4ed util: pass encoding.[encoding|encodingmode] as unicodes We need to pass str to encode() and decode(). diff -r ec7831675867 -r a9a28ca17615 mercurial/util.py --- a/mercurial/util.py Wed Mar 08 16:52:57 2017 -0800 +++ b/mercurial/util.py Sun Mar 12 07:35:13 2017 +0530 @@ -2241,13 +2241,16 @@ if width <= maxindent: # adjust for weird terminal size width = max(78, maxindent + 1) - line = line.decode(encoding.encoding, encoding.encodingmode) - initindent = initindent.decode(encoding.encoding, encoding.encodingmode) - hangindent = hangindent.decode(encoding.encoding, encoding.encodingmode) + line = line.decode(pycompat.sysstr(encoding.encoding), + pycompat.sysstr(encoding.encodingmode)) + initindent = initindent.decode(pycompat.sysstr(encoding.encoding), + pycompat.sysstr(encoding.encodingmode)) + hangindent = hangindent.decode(pycompat.sysstr(encoding.encoding), + pycompat.sysstr(encoding.encodingmode)) wrapper = MBTextWrapper(width=width, initial_indent=initindent, subsequent_indent=hangindent) - return wrapper.fill(line).encode(encoding.encoding) + return wrapper.fill(line).encode(pycompat.sysstr(encoding.encoding)) if (pyplatform.python_implementation() == 'CPython' and sys.version_info < (3, 0)):