From 165933bced02d2cb71624a9db6b10a6ddeaef0b6 Mon Sep 17 00:00:00 2001 From: Tobias Bossert Date: Mon, 29 Jun 2020 09:47:34 +0200 Subject: [PATCH] fixed xlsx import issue, now compatible with python 2.x and 3.x --- src/Mod/Spreadsheet/importXLSX.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Spreadsheet/importXLSX.py b/src/Mod/Spreadsheet/importXLSX.py index 654fd7c225..c96e1590f6 100644 --- a/src/Mod/Spreadsheet/importXLSX.py +++ b/src/Mod/Spreadsheet/importXLSX.py @@ -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):