Moved freeze_panes validation to io/excel.py

AnkurDedania · Mar 6, 2017 · a802fc7 · a802fc7
1 parent 09360d8
commit a802fc7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/pandas/core/frame.py b/pandas/core/frame.py
@@ -1431,24 +1431,12 @@ def to_excel(self, excel_writer, sheet_name='Sheet1', na_rep='',
                                        inf_rep=inf_rep)
 
         formatted_cells = formatter.get_formatted_cells()
-        freeze_panes = self._validate_freeze_panes(freeze_panes)
         excel_writer.write_cells(formatted_cells, sheet_name,
                                  startrow=startrow, startcol=startcol,
                                  freeze_panes=freeze_panes)
         if need_save:
             excel_writer.save()
 
-    def _validate_freeze_panes(self, freeze_panes):
-        if freeze_panes is not None:
-            if (
-                len(freeze_panes) == 2 and
-                all(isinstance(item, int) for item in freeze_panes)
-            ):
-                return freeze_panes
-
-                raise ValueError("freeze_panes must be of form (row, column)"
-                                 " where row and column are integers")
-
     def to_stata(self, fname, convert_dates=None, write_index=True,
                  encoding="latin-1", byteorder=None, time_stamp=None,
                  data_label=None, variable_labels=None):

diff --git a/pandas/io/excel.py b/pandas/io/excel.py
@@ -1331,8 +1331,15 @@ def write_cells(self, cells, sheet_name=None, startrow=0, startcol=0,
             self.sheets[sheet_name] = wks
 
         if freeze_panes is not None:
-            wks.freeze_panes = wks.cell(row=freeze_panes[0] + 1,
-                                        column=freeze_panes[1] + 1)
+            if (
+                len(freeze_panes) == 2 and
+                all(isinstance(item, int) for item in freeze_panes)
+            ):
+                wks.freeze_panes = wks.cell(row=freeze_panes[0] + 1,
+                                            column=freeze_panes[1] + 1)
+            else:
+                raise ValueError("freeze_panes must be of form (row, column)"
+                                 " where row and column are integers")
 
         for cell in cells:
             xcell = wks.cell(
@@ -1419,9 +1426,16 @@ def write_cells(self, cells, sheet_name=None, startrow=0, startcol=0,
             self.sheets[sheet_name] = wks
 
         if freeze_panes is not None:
-            wks.set_panes_frozen(True)
-            wks.set_horz_split_pos(freeze_panes[0])
-            wks.set_vert_split_pos(freeze_panes[1])
+            if (
+                len(freeze_panes) == 2 and
+                all(isinstance(item, int) for item in freeze_panes)
+            ):
+                wks.set_panes_frozen(True)
+                wks.set_horz_split_pos(freeze_panes[0])
+                wks.set_vert_split_pos(freeze_panes[1])
+            else:
+                raise ValueError("freeze_panes must be of form (row, column)"
+                                 " where row and column are integers")
 
         style_dict = {}
 
@@ -1551,7 +1565,14 @@ def write_cells(self, cells, sheet_name=None, startrow=0, startcol=0,
         style_dict = {}
 
         if freeze_panes is not None:
-            wks.freeze_panes(*(freeze_panes))
+            if (
+                len(freeze_panes) == 2 and
+                all(isinstance(item, int) for item in freeze_panes)
+            ):
+                wks.freeze_panes(*(freeze_panes))
+            else:
+                raise ValueError("freeze_panes must be of form (row, column)"
+                                 " where row and column are integers")
 
         for cell in cells:
             val = _conv_value(cell.val)