fix astanin#62: allow numpy arrays and pandas Index as headers

astanin · astanin · commit a58e478e9241 · 2015-08-20T12:58:35.000+02:00
diff --git a/tabulate.py b/tabulate.py
@@ -649,6 +649,13 @@ def _normalize_tabular_data(tabular_data, headers, showindex="default"):
 
     """
 
+    try:
+        bool(headers)
+        is_headers2bool_broken = False
+    except ValueError: # numpy.ndarray, pandas.core.index.Index, ...
+        is_headers2bool_broken = True
+        headers = list(headers)
+
     index = None
     if hasattr(tabular_data, "keys") and hasattr(tabular_data, "values"):
         # dict-like and pandas.DataFrame?
diff --git a/test/test_regression.py b/test/test_regression.py
@@ -216,15 +216,6 @@ def test_long_integers():
     assert_equal(result, expected)
 
 
-def test_align_long_integers():
-    "Regression: long integers should be aligned as integers (issue #61)"
-    table = [[_long_type(1)], [_long_type(234)]]
-    result = tabulate(table, tablefmt="plain")
-    expected = "\n".join(["  1",
-                          "234"])
-    assert_equal(result, expected)
-
-
 def test_colorclass_colors():
     "Regression: ANSI colors in a unicode/str subclass (issue #49)"
     try:
@@ -240,3 +231,24 @@ class textclass(_text_type):
         result = tabulate([[s]], tablefmt="plain")
         expected = "\x1b[35m3.14\x1b[39m"
         assert_equal(result, expected)
+
+
+def test_align_long_integers():
+    "Regression: long integers should be aligned as integers (issue #61)"
+    table = [[_long_type(1)], [_long_type(234)]]
+    result = tabulate(table, tablefmt="plain")
+    expected = "\n".join(["  1",
+                          "234"])
+    assert_equal(result, expected)
+
+
+def test_numpy_array_as_headers():
+    "Regression: NumPy array used as headers (issue #62)"
+    try:
+        import numpy as np
+        headers = np.array(["foo", "bar"])
+        result = tabulate([], headers, tablefmt="plain")
+        expected = "foo    bar"
+        assert_equal(result, expected)
+    except ImportError:
+        raise SkipTest()
