Fix a bug that header shifts wrongly when do tabulate(headers='keys', showindex=False) for pandas DataFrame with named index

pavlocat · pavlocat · commit ee2de9fc0193 · 2020-10-10T23:01:06.000+09:00
diff --git a/tabulate.py b/tabulate.py
@@ -1022,7 +1022,7 @@ def _normalize_tabular_data(tabular_data, headers, showindex="default"):
         elif hasattr(tabular_data, "index"):
             # values is a property, has .index => it's likely a pandas.DataFrame (pandas 0.11.0)
             keys = list(tabular_data)
-            if tabular_data.index.name is not None:
+            if showindex in ["default", "always", True] and tabular_data.index.name is not None:
                 if isinstance(tabular_data.index.name, list):
                     keys[:0] = tabular_data.index.name
                 else:
diff --git a/test/test_output.py b/test/test_output.py
@@ -1363,7 +1363,8 @@ def test_pandas_without_index():
         import pandas
 
         df = pandas.DataFrame(
-            [["one", 1], ["two", None]], columns=["string", "number"], index=["a", "b"]
+            [["one", 1], ["two", None]], columns=["string", "number"],
+            index=pandas.Index(["a", "b"], name="index")
         )
         expected = "\n".join(
             [

Original file line number	Diff line number	Diff line change
`@@ -1363,7 +1363,8 @@ def test_pandas_without_index():`
`1363`	`1363`	`import pandas`
`1364`	`1364`
`1365`	`1365`	`df = pandas.DataFrame(`
`1366`		`- [["one", 1], ["two", None]], columns=["string", "number"], index=["a", "b"]`
	`1366`	`+ [["one", 1], ["two", None]], columns=["string", "number"],`
	`1367`	`+ index=pandas.Index(["a", "b"], name="index")`
`1367`	`1368`	`)`
`1368`	`1369`	`expected = "\n".join(`
`1369`	`1370`	`[`