test: More tests for pformat

Author: MarcellPerger1

test/test_util/test_pformat.py

@@ -11,14 +11,13 @@ class MyEnum(enum.Enum):
 
 def dedent(s: str, keep_empty_ends=False):
     res = s.splitlines()
-    if not keep_empty_ends:
-        if res[0].lstrip() == '':
-            del res[0]
-        if res[-1].lstrip() == '':
-            del res[-1]
+    if res[0].lstrip() == '':
+        del res[0]
+    if res[-1].lstrip() == '':
+        del res[-1]
     by = min(next(i for (i, c) in enumerate(ln) if not c.isspace())
              for ln in res if ln and not ln.isspace())
-    return dedent_by(s, by, keep_empty_ends=True)
+    return dedent_by(s, by, keep_empty_ends)
 
 
 def dedent_by(s: str, by: int, keep_empty_ends=False):
@@ -29,7 +28,7 @@ def dedent_by(s: str, by: int, keep_empty_ends=False):
         if res[-1].lstrip() == '':
             del res[-1]
     for i, ln in enumerate(res):
-        start = next((j for j, c in enumerate(ln) if not c.isspace() or j > by), len(ln))
+        start = next((j for j, c in enumerate(ln) if not c.isspace() or j >= by), len(ln))
         res[i] = ln[start:]
     return '\n'.join(res)
 
@@ -45,19 +44,28 @@ def test_fmt_tuple(self):
         self.assertEqual('(MyEnum.FOO,)', pformat((MyEnum.FOO,)))
         self.assertEqual('(MyEnum.FOO, 6)', pformat((MyEnum.FOO, 6)))
         self.assertEqual(dedent('''
+        (
+          MyEnum.FOO,
+          (4, 5)
+        )'''), pformat((MyEnum.FOO, (4, 5))))
+        self.assertEqual(dedent('''
+        (
+          (
+            2,
+            3,
+            (4,)
+          ),
+        )'''), pformat(((2, 3, (4,)),)))
+        self.assertEqual(dedent('''
         (
             MyEnum.FOO,
             (4, 5)
-        )'''), pformat((MyEnum.FOO, (4, 5))))
+        )'''), pformat((MyEnum.FOO, (4, 5)), indent=4))
         self.assertEqual(dedent('''
         (
             (
-                (
-                    2,
-                    3,
-                    (
-                        4,
-                    )
-                )
-            )
-        )'''), pformat(((2, 3, (4,)),)))
+                2,
+                3,
+                (4,)
+            ),
+        )'''), pformat(((2, 3, (4,)),), indent=4))