Implement expand=True for str

Author: hugovk

Lib/pprint.py

@@ -406,7 +406,10 @@ def _pprint_str(self, object, stream, indent, allowance, context, level):
         chunks = []
         lines = object.splitlines(True)
         if level == 1:
-            indent += 1
+            if self._expand:
+                indent += self._indent_per_level
+            else:
+                indent += 1
             allowance += 1
         max_width1 = max_width = self._width - indent
         for i, line in enumerate(lines):
@@ -442,13 +445,13 @@ def _pprint_str(self, object, stream, indent, allowance, context, level):
             write(rep)
             return
         if level == 1:
-            write('(')
+            write(self._format_block_start("(", indent))
         for i, rep in enumerate(chunks):
             if i > 0:
                 write('\n' + ' '*indent)
             write(rep)
         if level == 1:
-            write(')')
+            write(self._format_block_end(")", indent - self._indent_per_level))
 
     _dispatch[str.__repr__] = _pprint_str
 

Lib/test/test_pprint.py

@@ -1945,6 +1945,20 @@ def test_expand_dict_items(self):
 ])""",
         )
 
+    def test_expand_str(self):
+        s = "The quick brown fox jumped over the lazy dog " * 3
+        self.assertEqual(
+            pprint.pformat(s, width=40, indent=4, expand=True),
+            """\
+(
+    'The quick brown fox jumped over '
+    'the lazy dog The quick brown fox '
+    'jumped over the lazy dog The '
+    'quick brown fox jumped over the '
+    'lazy dog '
+)""",
+        )
+
 
 class DottedPrettyPrinter(pprint.PrettyPrinter):