Merged in drobbinsfuntoo/python-tabulate/feature/multiline-rows (pull request astanin#36)

danielrobbins · astanin · commit ad9d67057530 · 2017-08-30T17:33:35.000Z
fix calculation of padding for lines with ANSI colors.
diff --git a/tabulate.py b/tabulate.py
@@ -483,17 +483,18 @@ def _afterpoint(string):
     else:
         return -1  # not a number
 
-
 def _padleft(width, s):
     """Flush right.
 
     >>> _padleft(6, '\u044f\u0439\u0446\u0430') == '  \u044f\u0439\u0446\u0430'
     True
 
     """
-    fmt = "{0:>%ds}" % width
-    return fmt.format(s)
-
+    vis = _strip_invisible(s)
+    pad = width - len(vis)
+    if pad > 0:
+        s = " " * pad + s
+    return s
 
 def _padright(width, s):
     """Flush left.
@@ -502,9 +503,11 @@ def _padright(width, s):
     True
 
     """
-    fmt = "{0:<%ds}" % width
-    return fmt.format(s)
-
+    vis = _strip_invisible(s)
+    pad = width - len(vis)
+    if pad > 0:
+        s = s + " " * pad
+    return s
 
 def _padboth(width, s):
     """Center string.
@@ -513,8 +516,12 @@ def _padboth(width, s):
     True
 
     """
-    fmt = "{0:^%ds}" % width
-    return fmt.format(s)
+    vis = _strip_invisible(s)
+    pad = width - len(vis)
+    if pad > 0:
+        pad_l = pad//2
+        s = " " * pad_l + s + " " * (pad - pad_l)
+    return s
 
 
 def _padnone(ignore_width, s):
@@ -614,7 +621,7 @@ def _align_column(strings, alignment, minwidth=0,
                 for ms in strings]
         else:
             # enable wide-character width corrections
-            s_lens = [max((len(s) for s in re.split("[\r\n]", ms))) for ms in strings]
+            s_lens = [max((width_fn(s) for s in re.split("[\r\n]", ms))) for ms in strings]
             visible_widths = [maxwidth - (w - l) for w, l in zip(s_widths, s_lens)]
             # wcswidth and _visible_width don't count invisible characters;
             # padfn doesn't need to apply another correction
@@ -625,7 +632,7 @@ def _align_column(strings, alignment, minwidth=0,
             padded_strings = [padfn(maxwidth, s) for s in strings]
         else:
             # enable wide-character width corrections
-            s_lens = list(map(len, strings))
+            s_lens = list(map(width_fn, strings))
             visible_widths = [maxwidth - (w - l) for w, l in zip(s_widths, s_lens)]
             # wcswidth and _visible_width don't count invisible characters;
             # padfn doesn't need to apply another correction
