Skip to content

avoid various error message regarding rowsIter() #30

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

Merged
staale merged 1 commit into from
Jun 24, 2015
Merged

avoid various error message regarding rowsIter() #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 14 additions & 11 deletions xlsx/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,21 +164,24 @@ def rowsIter(self):
formula = None
data = ''
try:
if columnNode.find('{http://schemas.openxmlformats.org/spreadsheetml/2006/main}v') is not None:
if len(columnNode)>0 and columnNode[0] is not None and columnNode.find('{http://schemas.openxmlformats.org/spreadsheetml/2006/main}v') is not None:
if colType == "s":
stringIndex = columnNode[0].text
data = self.workbook.sharedStrings[int(stringIndex)]
#Built in date-formatted fields
elif cellS and int(self.workbook.cellStyles[int(cellS)].get('numFmtId')) in range(14, 22+1):
data = xldate_as_tuple(
float(columnNode[0].text),
datemode=0)
elif cellS and (self.workbook.cellStyles[int(cellS)].get('numFmtId') in self.workbook.numFmts) \
and is_date_format_string(self.workbook.numFmts[self.workbook.cellStyles[int(cellS)].get('numFmtId')]):
data = xldate_as_tuple(
float(columnNode[0].text),
datemode=0)
elif len(columnNode)>0 and columnNode[0] is not None:
elif cellS and re.match("^[\d\.]+$", columnNode[0].text):
if int(self.workbook.cellStyles[int(cellS)].get('numFmtId')) in range(14, 22+1):
data = xldate_as_tuple(
float(columnNode[0].text),
datemode=0)
elif (self.workbook.cellStyles[int(cellS)].get('numFmtId') in self.workbook.numFmts) \
and is_date_format_string(self.workbook.numFmts[self.workbook.cellStyles[int(cellS)].get('numFmtId')]):
data = xldate_as_tuple(
float(columnNode[0].text),
datemode=0)
else:
data = columnNode.find("{http://schemas.openxmlformats.org/spreadsheetml/2006/main}v").text
else:
data = columnNode.find("{http://schemas.openxmlformats.org/spreadsheetml/2006/main}v").text
elif columnNode.find("{http://schemas.openxmlformats.org/spreadsheetml/2006/main}is") is not None:
if colType == "inlineStr":
Expand Down