fix astanin#49: colored numbers in a unicode/str subclass (colorclass compatibility)

astanin · astanin · commit 65484fb14fde · 2015-03-31T00:26:22.000+02:00
diff --git a/tabulate.py b/tabulate.py
@@ -525,7 +525,7 @@ def _format(val, valtype, floatfmt, missingval="", has_invisible=True):
         except TypeError:
             return _text_type(val)
     elif valtype is float:
-        is_a_colored_number = has_invisible and type(val) in [_text_type, _binary_type]
+        is_a_colored_number = has_invisible and isinstance(val, (_text_type, _binary_type))
         if is_a_colored_number:
             raw_val = _strip_invisible(val)
             formatted_val = format(float(raw_val), floatfmt)
diff --git a/test/test_regression.py b/test/test_regression.py
@@ -4,7 +4,7 @@
 
 from __future__ import print_function
 from __future__ import unicode_literals
-from tabulate import tabulate
+from tabulate import tabulate, _text_type
 from common import assert_equal, assert_in
 
 
@@ -214,3 +214,20 @@ def test_long_integers():
     result = tabulate(table, tablefmt="plain")
     expected = "18446744073709551614"
     assert_equal(result, expected)
+
+
+def test_colorclass_colors():
+    "Regression: ANSI colors in a unicode/str subclass (issue #49)"
+    try:
+        import colorclass
+        s = colorclass.Color("{magenta}3.14{/magenta}")
+        result = tabulate([[s]], tablefmt="plain")
+        expected = "\x1b[35m3.14\x1b[39m"
+        assert_equal(result, expected)
+    except ImportError:
+        class textclass(_text_type):
+            pass
+        s = textclass("\x1b[35m3.14\x1b[39m")
+        result = tabulate([[s]], tablefmt="plain")
+        expected = "\x1b[35m3.14\x1b[39m"
+        assert_equal(result, expected)
