kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fixed xlsx import issue, now compatible with python 2.x and 3.x

Browse Source
This commit is contained in:
Tobias Bossert
2020-06-29 09:47:34 +02:00
committed by wwmayer
parent 603b19d7c8
commit 165933bced
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Spreadsheet/importXLSX.py
View File

@@ -321,7 +321,10 @@ def getText(nodelist):
for node in nodelist:
if node.nodeType == node.TEXT_NODE:
rc.append(node.data)
return ''.join(rc)
if sys.version_info.major >= 3:
return ''.join(rc)
else:
return ''.join(rc).encode('utf8')
def handleWorkSheet(theDom, actSheet, strList):
@@ -352,7 +355,7 @@ def handleCells(cellList, actCellSheet, sList):
theString = getText(tElement.childNodes)
#print('theString: ', theString)
actCellSheet.set(ref, theString.encode('utf8'))
actCellSheet.set(ref, theString)
formulaRef = cell.getElementsByTagName("f")
if len(formulaRef)==1:
@@ -372,10 +375,7 @@ def handleCells(cellList, actCellSheet, sList):
if cellType == 'n':
actCellSheet.set(ref, theValue)
if cellType == 's':
if sys.version_info.major >= 3:
actCellSheet.set(ref, (sList[int(theValue)]))
else:
actCellSheet.set(ref, (sList[int(theValue)]).encode('utf8'))
actCellSheet.set(ref, (sList[int(theValue)]))
def handleWorkBook(theBook, sheetDict, Doc):