summaryrefslogtreecommitdiffstats
path: root/Lib/textwrap.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-10-28 19:39:36 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-10-28 19:39:36 (GMT)
commitea4cb63e68d96697ff8eb9ea86da6158f27b95a2 (patch)
tree017471658ea2343cce55ac59a16926db4c0b60e1 /Lib/textwrap.py
parent68b6874f59d80c41785a4d4a6874be89ad08fcd5 (diff)
downloadcpython-ea4cb63e68d96697ff8eb9ea86da6158f27b95a2.zip
cpython-ea4cb63e68d96697ff8eb9ea86da6158f27b95a2.tar.gz
cpython-ea4cb63e68d96697ff8eb9ea86da6158f27b95a2.tar.bz2
Issue #21827: Fixed textwrap.dedent() for the case when largest common
whitespace is a substring of smallest leading whitespace. Based on patch by Robert Li.
Diffstat (limited to 'Lib/textwrap.py')
-rw-r--r--Lib/textwrap.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/Lib/textwrap.py b/Lib/textwrap.py
index 58867f9..1759b0d 100644
--- a/Lib/textwrap.py
+++ b/Lib/textwrap.py
@@ -429,11 +429,15 @@ def dedent(text):
elif margin.startswith(indent):
margin = indent
- # Current line and previous winner have no common whitespace:
- # there is no margin.
+ # Find the largest common whitespace between current line and previous
+ # winner.
else:
- margin = ""
- break
+ for i, (x, y) in enumerate(zip(margin, indent)):
+ if x != y:
+ margin = margin[:i]
+ break
+ else:
+ margin = margin[:len(indent)]
# sanity check (testing/debugging only)
if 0 and margin: