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

fix several Py3 issues

Browse Source
This commit is contained in:
wmayer
2019-01-03 18:11:37 +01:00
parent 730f314839
commit 3e12a59d41
12 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Arch/importGBXML.py
View File

@@ -89,7 +89,7 @@ def export(objectslist,filename):
# spaces
for space in Draft.getObjectsOfType(Draft.getGroupContents(building.Group,addgroups=True),"Space"):
if not space.Zone:
FreeCAD.Console.PrintError(translate("Arch","Error: Space '%s' has no Zone. Aborting.")+ "\n" + % space.Label)
FreeCAD.Console.PrintError(translate("Arch","Error: Space '%s' has no Zone. Aborting.") % space.Label + "\n")
return
filestream.write( ' <Space id="%s" spaceType="%s" zoneIdRef="%s" conditionType="%f">\n' % (space.Name, space.SpaceType, space.Zone.Name, space.Conditioning) )
#filestream.write( ' <CADObjectId>%s</CADObjectId>\n' % space.Name ) # not sure what this is used for?

2
src/Mod/Assembly/DevAssembly.py
View File

@@ -1,5 +1,5 @@
import FreeCAD,Assembly,time
print "Script to test the assembly development"
print ("Script to test the assembly development")
time.sleep(3)

36
src/Mod/Path/PathScripts/post/fablin_post.py
View File

@@ -1,7 +1,7 @@
#***************************************************************************
#* (c) imarin 2017 *
#* (c) imarin 2017 *
#* *
#* heavily based on gbrl post-procesor by: *
#* heavily based on gbrl post-procesor by: *
#* (c) sliptonic (shopinthewoods@gmail.com) 2014 *
#* *
#* This file is part of the FreeCAD CAx development system. *
@@ -116,22 +116,22 @@ def processArguments(argstring):
elif arg == '--show-editor':
SHOW_EDITOR = True
elif arg == '--no-show-editor':
SHOW_EDITOR = False
SHOW_EDITOR = False
params = arg.split('=')
params = arg.split('=')
if params[0] == '--rapids-feedrate':
RAPID_FEEDRATE = params[1]
RAPID_FEEDRATE = params[1]
def export(objectslist,filename,argstring):
processArguments(argstring)
global UNITS
for obj in objectslist:
if not hasattr(obj,"Path"):
print "the object " + obj.Name + " is not a path. Please select only path and Compounds."
print ("the object " + obj.Name + " is not a path. Please select only path and Compounds.")
return
print "postprocessing..."
print ("postprocessing...")
gcode = ""
#Find the machine.
@@ -144,7 +144,7 @@ def export(objectslist,filename,argstring):
if p.Name == "Machine":
myMachine = p
if myMachine is None:
print "No machine found in this project"
print ("No machine found in this project")
else:
if myMachine.MachineUnits == "Metric":
UNITS = "G21"
@@ -195,7 +195,7 @@ def export(objectslist,filename,argstring):
else:
final = gcode
print "done postprocessing."
print ("done postprocessing.")
gfile = pythonopen(filename,"wb")
gfile.write(gcode)
@@ -232,13 +232,13 @@ def parse(pathobj):
outstring = []
command = c.Name
# fablin does not support parenthesis syntax, so removing that (pocket) in the agnostic gcode
if command[0] == '(':
if not OUTPUT_COMMENTS: pass
else:
outstring.append(command)
# fablin does not support parenthesis syntax, so removing that (pocket) in the agnostic gcode
if command[0] == '(':
if not OUTPUT_COMMENTS: pass
else:
outstring.append(command)
# if modal: only print the command if it is not the same as the last one
# if modal: only print the command if it is not the same as the last one
if MODAL == True:
if command == lastcommand:
outstring.pop(0)
@@ -255,8 +255,8 @@ def parse(pathobj):
else:
outstring.append(param + format(c.Parameters[param], '.4f'))
if command in RAPID_MOVES and command != lastcommand:
outstring.append('F' + format(RAPID_FEEDRATE))
if command in RAPID_MOVES and command != lastcommand:
outstring.append('F' + format(RAPID_FEEDRATE))
# store the latest command
lastcommand = command
@@ -292,5 +292,5 @@ def parse(pathobj):
return out
print __name__ + " gcode postprocessor loaded."
print (__name__ + " gcode postprocessor loaded.")

2
src/Mod/Path/libarea/kurve/test.py
View File

@@ -6,4 +6,4 @@ m = area.Matrix([1,0,0,12, 0,1,0,0, 0,0,1,0, 0,0,0,1])
p.Transform(m)
print p.x, p.y
print (p.x, p.y)

12
src/Mod/TechDraw/moveViews.py
View File

@@ -18,11 +18,11 @@ def moveViews():
s = FreeCADGui.Selection.getSelection()
if len(s) != 2:
print "Please select 1 Drawing Page and 1 TechDraw Page"
print ("Please select 1 Drawing Page and 1 TechDraw Page")
return
print "First object in selection is a: ", s[0].TypeId
print "Second object in selection is a: ", s[1].TypeId
print ("First object in selection is a: ", s[0].TypeId)
print ("Second object in selection is a: ", s[1].TypeId)
if s[0].isDerivedFrom("Drawing::FeaturePage") and \
s[1].isDerivedFrom("TechDraw::DrawPage"):
dPage = s[0]
@@ -32,20 +32,20 @@ def moveViews():
tPage = s[0]
dPage = s[1]
else:
print "Please select 1 Drawing Page and 1 TechDraw Page"
print ("Please select 1 Drawing Page and 1 TechDraw Page")
return
i = 1
for o in dPage.OutList:
newName = "DraftView" + str(i).zfill(3)
print "moving " + o.Name + " to " + newName
print ("moving " + o.Name + " to " + newName)
svg = svgHead + o.ViewResult + svgTail
no = FreeCAD.ActiveDocument.addObject('TechDraw::DrawViewSymbol',newName)
no.Symbol = svg
tPage.addView(no)
i += 1
print "moveViews moved " + str(i-1) + " views"
print ("moveViews moved " + str(i-1) + " views")
if __name__ == '__main__':
moveViews()