IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove a hack for py2 from TextWrapper

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-12-15 20:51:52 +09:00
parent 2aa9e5ed3a
commit 3408351636
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sphinx/writers/text.py
View File

@ -273,7 +273,6 @@ class TextWrapper(textwrap.TextWrapper):
The original _wrap_chunks uses len() to calculate width. The original _wrap_chunks uses len() to calculate width.
This method respects wide/fullwidth characters for width adjustment. This method respects wide/fullwidth characters for width adjustment.
""" """
drop_whitespace = getattr(self, 'drop_whitespace', True) # py25 compat
lines = [] # type: List[unicode] lines = [] # type: List[unicode]
if self.width <= 0: if self.width <= 0:
raise ValueError("invalid width %r (must be > 0)" % self.width) raise ValueError("invalid width %r (must be > 0)" % self.width)
@ -291,7 +290,7 @@ class TextWrapper(textwrap.TextWrapper):
width = self.width - column_width(indent) width = self.width - column_width(indent)
if drop_whitespace and chunks[-1].strip() == '' and lines: if self.drop_whitespace and chunks[-1].strip() == '' and lines:
del chunks[-1] del chunks[-1]
while chunks: while chunks:
@ -307,7 +306,7 @@ class TextWrapper(textwrap.TextWrapper):
if chunks and column_width(chunks[-1]) > width: if chunks and column_width(chunks[-1]) > width:
self._handle_long_word(chunks, cur_line, cur_len, width) self._handle_long_word(chunks, cur_line, cur_len, width)
if drop_whitespace and cur_line and cur_line[-1].strip() == '': if self.drop_whitespace and cur_line and cur_line[-1].strip() == '':
del cur_line[-1] del cur_line[-1]
if cur_line: if cur_line: