fix astanin#42: broken decimal alignment of ANSI-colored numberes

astanin · astanin · commit f89db531cee8 · 2015-01-22T17:58:29.000+01:00
diff --git a/tabulate.py b/tabulate.py
@@ -442,7 +442,10 @@ def _align_column(strings, alignment, minwidth=0, has_invisible=True):
         strings = [s.strip() for s in strings]
         padfn = _padboth
     elif alignment == "decimal":
-        decimals = [_afterpoint(s) for s in strings]
+        if has_invisible:
+            decimals = [_afterpoint(_strip_invisible(s)) for s in strings]
+        else:
+            decimals = [_afterpoint(s) for s in strings]
         maxdecimals = max(decimals)
         strings = [s + (maxdecimals - decs) * " "
                    for s, decs in zip(strings, decimals)]
diff --git a/test/test_regression.py b/test/test_regression.py
@@ -194,3 +194,15 @@ def test_ansi_color_for_decimal_numbers():
         '-------  ---'])
     result = tabulate(table)
     assert_equal(result, expected)
+
+
+def test_alignment_of_decimal_numbers_with_ansi_color():
+    "Regression: alignment for decimal numbers with ANSI color (issue #42)"
+    v1 = "\033[95m" + "12.34" + "\033[0m"
+    v2 = "\033[95m" + "1.23456" + "\033[0m"
+    table = [[v1], [v2]]
+    expected = "\n".join([
+        '\x1b[95m12.34\x1b[0m',
+        ' \x1b[95m1.23456\x1b[0m'])
+    result = tabulate(table, tablefmt="plain")
+    assert_equal(result, expected)
