From ea4cb63e68d96697ff8eb9ea86da6158f27b95a2 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 28 Oct 2015 21:39:36 +0200
Subject: 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.

---
 Lib/test/test_textwrap.py |  5 +++++
 Lib/textwrap.py           | 12 ++++++++----
 Misc/ACKS                 |  1 +
 Misc/NEWS                 |  4 ++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Lib/test/test_textwrap.py b/Lib/test/test_textwrap.py
index 1bba77e..ea7c089 100644
--- a/Lib/test/test_textwrap.py
+++ b/Lib/test/test_textwrap.py
@@ -732,6 +732,11 @@ def foo():
         expect = "hello there\n  how are you?"
         self.assertEqual(expect, dedent(text))
 
+        # test margin is smaller than smallest indent
+        text = "  \thello there\n   \thow are you?\n \tI'm fine, thanks"
+        expect = " \thello there\n  \thow are you?\n\tI'm fine, thanks"
+        self.assertEqual(expect, dedent(text))
+
 
 # Test textwrap.indent
 class IndentTestCase(unittest.TestCase):
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:
diff --git a/Misc/ACKS b/Misc/ACKS
index 893fb2d..abf7304 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -823,6 +823,7 @@ Mark Levitt
 Ivan Levkivskyi
 William Lewis
 Akira Li
+Robert Li
 Xuanji Li
 Robert van Liere
 Ross Light
diff --git a/Misc/NEWS b/Misc/NEWS
index 7d673b2..3d4cbcb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -96,6 +96,10 @@ Core and Builtins
 Library
 -------
 
+- 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.
+
 - Issue #25471: Sockets returned from accept() shouldn't appear to be
   nonblocking.
 
-- 
cgit v0.12