Skip to content

Moved freeze_panes validation to io/excel.py (#15160) #15592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Moved freeze_panes validation to io/excel.py (#15160) #15592

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a802fc7
Moved freeze_panes validation to io/excel.py
jeffcarey Mar 6, 2017
81cb86f
Cleaned up freeze_panes validation code
jeffcarey Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Cleaned up freeze_panes validation code
  • Loading branch information
@jeffcarey
jeffcarey committed Mar 7, 2017
commit 81cb86f00b15df15e9b5c389e838c5cc4d6761e0
55 changes: 25 additions & 30 deletions pandas/io/excel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,22 @@ def __exit__(self, exc_type, exc_value, traceback):
self.close()


def _validate_freeze_panes(freeze_panes):
if freeze_panes is not None:
if (
len(freeze_panes) == 2 and
all(isinstance(item, int) for item in freeze_panes)
):
return True

raise ValueError("freeze_panes must be of form (row, column)"
" where row and column are integers")

# freeze_panes wasn't specified, return False so it won't be applied
# to output sheet
return False


def _trim_excel_header(row):
# trim header row so auto-index inference works
# xlrd uses '' , openpyxl None
Expand Down Expand Up @@ -1330,16 +1346,9 @@ def write_cells(self, cells, sheet_name=None, startrow=0, startcol=0,
wks.title = sheet_name
self.sheets[sheet_name] = wks

if freeze_panes is not None:
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")
if _validate_freeze_panes(freeze_panes):
wks.freeze_panes = wks.cell(row=freeze_panes[0] + 1,
column=freeze_panes[1] + 1)

for cell in cells:
xcell = wks.cell(
Expand Down Expand Up @@ -1425,17 +1434,10 @@ def write_cells(self, cells, sheet_name=None, startrow=0, startcol=0,
wks = self.book.add_sheet(sheet_name)
self.sheets[sheet_name] = wks

if freeze_panes is not None:
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")
if _validate_freeze_panes(freeze_panes):
wks.set_panes_frozen(True)
wks.set_horz_split_pos(freeze_panes[0])
wks.set_vert_split_pos(freeze_panes[1])

style_dict = {}

Expand Down Expand Up @@ -1564,15 +1566,8 @@ def write_cells(self, cells, sheet_name=None, startrow=0, startcol=0,

style_dict = {}

if freeze_panes is not None:
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")
if _validate_freeze_panes(freeze_panes):
wks.freeze_panes(*(freeze_panes))

for cell in cells:
val = _conv_value(cell.val)
Expand Down