write index labels in same row as columns

Author: locojaydev

pandas/core/format.py

@@ -863,9 +863,14 @@ def _format_regular_rows(self):
                 index_label = self.df.index.names[0]
 
             if index_label:
-                yield ExcelCell(self.rowcounter, 0,
+                # add to same level as column names
+                if isinstance(self.df.columns, MultiIndex):
+                    yield ExcelCell(self.rowcounter, 0,
+                                index_label, header_style)
+                    self.rowcounter += 1
+                else:
+                    yield ExcelCell(self.rowcounter - 1, 0,
                                 index_label, header_style)
-                self.rowcounter += 1
 
             #write index_values
             index_values = self.df.index
@@ -895,6 +900,10 @@ def _format_hierarchical_rows(self):
 
             #if index labels are not empty go ahead and dump
             if filter(lambda x: x is not None, index_labels):
+                if isinstance(self.df.columns, MultiIndex):
+                    self.rowcounter += 1
+                else:
+                    self.rowcounter -= 1
                 for cidx, name in enumerate(index_labels):
                     yield ExcelCell(self.rowcounter, cidx,
                                     name, header_style)

pandas/io/tests/test_excel.py

@@ -257,7 +257,7 @@ def _check_extension(self, ext):
         # test roundtrip
         self.frame.to_excel(path,'test1')
         reader = ExcelFile(path)
-        recons = reader.parse('test1', index_col=0, has_index_names=True)
+        recons = reader.parse('test1', index_col=0)
         tm.assert_frame_equal(self.frame, recons)
 
         self.frame.to_excel(path,'test1', index=False)
@@ -268,8 +268,7 @@ def _check_extension(self, ext):
 
         self.frame.to_excel(path,'test1',na_rep='NA')
         reader = ExcelFile(path)
-        recons = reader.parse('test1', index_col=0, na_values=['NA'],
-                              has_index_names=True)
+        recons = reader.parse('test1', index_col=0, na_values=['NA'])
         tm.assert_frame_equal(self.frame, recons)
 
         os.remove(path)
@@ -290,7 +289,7 @@ def _check_extension_mixed(self, ext):
 
         self.mixed_frame.to_excel(path,'test1')
         reader = ExcelFile(path)
-        recons = reader.parse('test1', index_col=0, has_index_names=True)
+        recons = reader.parse('test1', index_col=0)
         tm.assert_frame_equal(self.mixed_frame, recons)
 
         os.remove(path)
@@ -397,7 +396,7 @@ def _check_extension_sheets(self, ext):
         self.tsframe.to_excel(writer,'test2')
         writer.save()
         reader = ExcelFile(path)
-        recons = reader.parse('test1',index_col=0, has_index_names=True)
+        recons = reader.parse('test1',index_col=0)
         tm.assert_frame_equal(self.frame, recons)
         recons = reader.parse('test2',index_col=0)
         tm.assert_frame_equal(self.tsframe, recons)
@@ -429,7 +428,7 @@ def _check_extension_colaliases(self, ext):
         col_aliases = Index(['AA', 'X', 'Y', 'Z'])
         self.frame2.to_excel(path, 'test1', header=col_aliases)
         reader = ExcelFile(path)
-        rs = reader.parse('test1', index_col=0, has_index_names=True)
+        rs = reader.parse('test1', index_col=0)
         xp = self.frame2.copy()
         xp.columns = col_aliases
         tm.assert_frame_equal(xp, rs)
@@ -458,24 +457,21 @@ def _check_extension_indexlabels(self, ext):
         frame = (DataFrame(np.random.randn(10,2)) >= 0)
         frame.to_excel(path, 'test1', index_label=['test'])
         reader = ExcelFile(path)
-        recons = reader.parse('test1', index_col=0,
-                              has_index_names=True).astype(np.int64)
+        recons = reader.parse('test1', index_col=0).astype(np.int64)
         frame.index.names = ['test']
         self.assertEqual(frame.index.names, recons.index.names)
 
         frame = (DataFrame(np.random.randn(10,2)) >= 0)
         frame.to_excel(path, 'test1', index_label=['test', 'dummy', 'dummy2'])
         reader = ExcelFile(path)
-        recons = reader.parse('test1', index_col=0,
-                              has_index_names=True).astype(np.int64)
+        recons = reader.parse('test1', index_col=0).astype(np.int64)
         frame.index.names = ['test']
         self.assertEqual(frame.index.names, recons.index.names)
 
         frame = (DataFrame(np.random.randn(10,2)) >= 0)
         frame.to_excel(path, 'test1', index_label='test')
         reader = ExcelFile(path)
-        recons = reader.parse('test1', index_col=0,
-                              has_index_names=True).astype(np.int64)
+        recons = reader.parse('test1', index_col=0).astype(np.int64)
         frame.index.names = ['test']
         self.assertEqual(frame.index.names, recons.index.names)
 
@@ -555,8 +551,7 @@ def _check_excel_multiindex(self, ext):
         # round trip
         frame.to_excel(path, 'test1')
         reader = ExcelFile(path)
-        df = reader.parse('test1', index_col=[0,1], parse_dates=False,
-                          has_index_names=True)
+        df = reader.parse('test1', index_col=[0,1], parse_dates=False)
         tm.assert_frame_equal(frame, df)
         self.assertEqual(frame.index.names, df.index.names)
         self.frame.index = old_index # needed if setUP becomes a classmethod
@@ -583,7 +578,7 @@ def _check_excel_multiindex_dates(self, ext):
 
         tsframe.to_excel(path, 'test1', index_label = ['time','foo'])
         reader = ExcelFile(path)
-        recons = reader.parse('test1', index_col=[0,1], has_index_names=True)
+        recons = reader.parse('test1', index_col=[0,1])
         tm.assert_frame_equal(tsframe, recons)
 
         # infer index