pool/FreeCAD
SHA256
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=36
This commit is contained in:
Adrian Schröter
2018-04-17 14:19:22 +00:00
committed by Git OBS Bridge
parent 5340b8d5bc
commit c860d527e6
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fix-draft-module-with-python3.patch
View File

@@ -1,18 +1,29 @@
commit 338630b951abab1e44b01c80fbe2d07aba415daf
Author: Adrian Schröter <adrian@suse.de>
Date: Tue Apr 17 08:39:39 2018 +0200
fix runtime error creating a wire from string with python3
Tested against version 0.17
diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
index 4c27018c4..f48c11528 100644
index 4c27018c4..da8db2895 100644
--- a/src/Mod/Draft/Draft.py
+++ b/src/Mod/Draft/Draft.py
@@ -6133,8 +6133,7 @@ class _ShapeString(_DraftObject):
@@ -6133,8 +6133,10 @@ class _ShapeString(_DraftObject):
ff8 = obj.FontFile.encode('utf8') # 1947 accents in filepath
# TODO: change for Py3?? bytes?
# Part.makeWireString uses FontFile as char* string
-# CharList = Part.makeWireString(obj.String,obj.FontFile,obj.Size,obj.Tracking)
- CharList = Part.makeWireString(obj.String,ff8,obj.Size,obj.Tracking)
+ CharList = Part.makeWireString(obj.String,obj.FontFile,obj.Size,obj.Tracking)
+ if sys.version_info.major < 3:
+ CharList = Part.makeWireString(obj.String,ff8,obj.Size,obj.Tracking)
+ else:
+ CharList = Part.makeWireString(obj.String,obj.FontFile,obj.Size,obj.Tracking)
if len(CharList) == 0:
msg(translate("draft","ShapeString: string has no wires\n"), 'warning')
return
@@ -6142,8 +6141,7 @@ class _ShapeString(_DraftObject):
@@ -6142,8 +6144,7 @@ class _ShapeString(_DraftObject):
# test a simple letter to know if we have a sticky font or not
sticky = False