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

py3: arch: fix unicode problems #3590

Browse Source
This commit is contained in:
looooo
2018-10-17 09:55:03 +02:00
committed by wmayer
parent a281832627
commit 1e6818b6fb
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Arch/ArchCommands.py
View File

@@ -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:

7
src/Mod/Arch/ArchSchedule.py
View File

@@ -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)