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

util: look for empty-sysstr instead of empty-bytesstr in textwrap code

Browse Source 
Fixes behavior on Python 3.
This commit is contained in:
Augie Fackler 2017-05-28 16:17:43 -04:00
parent a2d8d347df
commit 544ce9f54d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/util.py
View File

@ -2310,7 +2310,7 @@ def MBTextWrapper(**kwargs):
# First chunk on line is whitespace -- drop it, unless this
# is the very beginning of the text (i.e. no lines started yet).
if self.drop_whitespace and chunks[-1].strip() == '' and lines:
if self.drop_whitespace and chunks[-1].strip() == r'' and lines:
del chunks[-1]
while chunks:
@ -2332,7 +2332,7 @@ def MBTextWrapper(**kwargs):
# If the last chunk on this line is all whitespace, drop it.
if (self.drop_whitespace and
cur_line and cur_line[-1].strip() == ''):
cur_line and cur_line[-1].strip() == r''):
del cur_line[-1]
# Convert current line back to a string and store it in list