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

Draft: Remove Python 2 type support

Browse Source
This commit is contained in:
marioalexis
2022-03-28 18:02:23 -03:00
parent 5a0bcbbb9c
commit 79b7bfd5d0
6 changed files with 8 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Draft/draftobjects/shapestring.py
View File

@@ -27,7 +27,6 @@
## \addtogroup draftobjects
# @{
import sys
from PySide.QtCore import QT_TRANSLATE_NOOP
import FreeCAD as App
@@ -61,17 +60,11 @@ class ShapeString(DraftObject):
def execute(self, obj):
import Part
# import OpenSCAD2Dgeom
import os
if obj.String and obj.FontFile:
if obj.Placement:
plm = obj.Placement
ff8 = obj.FontFile.encode('utf8') # 1947 accents in filepath
# TODO: change for Py3?? bytes?
# Part.makeWireString uses FontFile as char* string
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)
CharList = Part.makeWireString(obj.String,obj.FontFile,obj.Size,obj.Tracking)
if len(CharList) == 0:
App.Console.PrintWarning(translate("draft","ShapeString: string has no wires")+"\n")
return
@@ -79,10 +72,7 @@ class ShapeString(DraftObject):
# test a simple letter to know if we have a sticky font or not
sticky = False
if sys.version_info.major < 3:
testWire = Part.makeWireString("L",ff8,obj.Size,obj.Tracking)[0][0]
else:
testWire = Part.makeWireString("L",obj.FontFile,obj.Size,obj.Tracking)[0][0]
testWire = Part.makeWireString("L",obj.FontFile,obj.Size,obj.Tracking)[0][0]
if testWire.isClosed:
try:
testFace = Part.Face(testWire)