From 1e6818b6fbf86ad08d8fc85252dddcae8891dd54 Mon Sep 17 00:00:00 2001 From: looooo Date: Wed, 17 Oct 2018 09:55:03 +0200 Subject: [PATCH] py3: arch: fix unicode problems #3590 --- src/Mod/Arch/ArchCommands.py | 3 ++- src/Mod/Arch/ArchSchedule.py | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py index 9072a98bc7..d2561f264e 100644 --- a/src/Mod/Arch/ArchCommands.py +++ b/src/Mod/Arch/ArchCommands.py @@ -1020,7 +1020,8 @@ class SurveyTaskPanel: if hasattr(FreeCAD,"SurveyObserver"): u = FreeCAD.Units.Quantity(FreeCAD.SurveyObserver.totalLength,FreeCAD.Units.Length) t = u.getUserPreferred()[0] - t = t.encode("utf8") + if sys.version_info.major < 3: + t = t.encode("utf8") if FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch").GetBool("surveyUnits",True): QtGui.QApplication.clipboard().setText(t) else: diff --git a/src/Mod/Arch/ArchSchedule.py b/src/Mod/Arch/ArchSchedule.py index aa8a83bc4b..d12f23467b 100644 --- a/src/Mod/Arch/ArchSchedule.py +++ b/src/Mod/Arch/ArchSchedule.py @@ -22,6 +22,7 @@ #* * #*************************************************************************** +import sys import FreeCAD, time if FreeCAD.GuiUp: import FreeCADGui, Arch_rc, os @@ -109,7 +110,11 @@ class _ArchSchedule: # blank line continue # write description - obj.Result.set("A"+str(i+2),obj.Description[i].encode("utf8")) + if sys.version_info.major >= 3: + # use unicode for python3 + obj.Result.set("A"+str(i+2), obj.Description[i]) + else: + obj.Result.set("A"+str(i+2), obj.Description[i].encode("utf8")) if verbose: l= "OPERATION: "+obj.Description[i] print (l)