fix astanin#31: TypeError on Py2 on mixed column value types

astanin · astanin · commit efcf79cf4aa1 · 2014-09-15T12:25:00.000+02:00
The original patch was submitted by an anonymous
user (Greg).  The test was moved to test/test_regression.py
and extended with a Unicode value.
diff --git a/tabulate.py b/tabulate.py
@@ -448,7 +448,10 @@ def _format(val, valtype, floatfmt, missingval=""):
     if valtype in [int, _text_type]:
         return "{0}".format(val)
     elif valtype is _binary_type:
-        return _text_type(val, "ascii")
+        try:
+            return _text_type(val, "ascii")
+        except TypeError:
+            return _text_type(val)
     elif valtype is float:
         return format(float(val), floatfmt)
     else:
diff --git a/test/test_regression.py b/test/test_regression.py
@@ -125,3 +125,19 @@ def test_numeric_column_headers():
         "  3    3    3    3    3",
         "  4    4    4    4    4",])
     assert_equal(result, expected)
+
+
+def test_column_with_mixed_value_types():
+    "Regression: mixed value types in the same column (issue #31)"
+    expected = '\n'.join([
+        '-----',
+        '',
+        'a',
+        'я',
+        '0',
+        'False',
+        '-----',
+    ])
+    data = [[None], ['a'], ['\u044f'], [0], [False]]
+    table = tabulate(data)
+    assert_equal(table, expected)
