facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

util: pass encoding.[encoding|encodingmode] as unicodes

Browse Source 
We need to pass str to encode() and decode().
This commit is contained in:
Pulkit Goyal 2017-03-12 07:35:13 +05:30
parent 8f0998647c
commit 7deacd3d03
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mercurial/util.py
View File

@ -2241,13 +2241,16 @@ def wrap(line, width, initindent='', hangindent=''):
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)):