diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py index 9eecc618f..8359a9a4d 100644 --- a/src/Mod/Arch/ArchComponent.py +++ b/src/Mod/Arch/ArchComponent.py @@ -633,7 +633,7 @@ class Component: except Part.OCCError: # error in computing the areas. Better set them to zero than show a wrong value if obj.HorizontalArea.Value != 0: - print "Debug: Error computing areas for ",obj.Label,": unable to project face: ",str([v.Point for v in f.Vertexes])," (face normal:",f.normalAt(0,0),")" + print("Debug: Error computing areas for ",obj.Label,": unable to project face: ",str([v.Point for v in f.Vertexes])," (face normal:",f.normalAt(0,0),")") obj.HorizontalArea = 0 if hasattr(obj,"PerimeterLength"): if obj.PerimeterLength.Value != 0: diff --git a/src/Mod/Arch/ArchRoof.py b/src/Mod/Arch/ArchRoof.py index b79825e17..195023c87 100644 --- a/src/Mod/Arch/ArchRoof.py +++ b/src/Mod/Arch/ArchRoof.py @@ -647,10 +647,10 @@ class _Roof(ArchComponent.Component): rn += 1 if obj.RidgeLength.Value != rl: obj.RidgeLength = rl - print str(rn)+" ridge edges in roof "+obj.Name + print(str(rn)+" ridge edges in roof "+obj.Name) if obj.BorderLength.Value != bl: obj.BorderLength = bl - print str(bn)+" border edges in roof "+obj.Name + print(str(bn)+" border edges in roof "+obj.Name) ArchComponent.Component.computeAreas(self,obj) diff --git a/src/Mod/Arch/ArchSchedule.py b/src/Mod/Arch/ArchSchedule.py index 88e527310..ba4c16598 100644 --- a/src/Mod/Arch/ArchSchedule.py +++ b/src/Mod/Arch/ArchSchedule.py @@ -112,8 +112,8 @@ class _ArchSchedule: obj.Result.set("A"+str(i+2),obj.Description[i].encode("utf8")) if verbose: l= "OPERATION: "+obj.Description[i] - print l - print len(l)*"=" + print (l) + print (len(l)*"=") # get list of objects objs = obj.Objects[i] val = obj.Value[i] @@ -172,7 +172,7 @@ class _ArchSchedule: if val.upper() == "COUNT": val = len(objs) if verbose: - print val, ",".join([o.Label for o in objs]) + print (val, ",".join([o.Label for o in objs])) obj.Result.set("B"+str(i+2),str(val)) else: vals = val.split(".") @@ -180,13 +180,13 @@ class _ArchSchedule: for o in objs: if verbose: l = o.Name+" ("+o.Label+"):" - print l+(40-len(l))*" ", + print (l+(40-len(l))*" ",) try: d = o for v in vals[1:]: d = getattr(d,v) if verbose: - print d + print (d) if hasattr(d,"Value"): d = d.Value except: @@ -216,7 +216,7 @@ class _ArchSchedule: else: obj.Result.set("B"+str(i+2),str(val)) if verbose: - print "TOTAL:"+34*" "+str(val) + print ("TOTAL:"+34*" "+str(val)) def __getstate__(self): return self.Type diff --git a/src/Mod/Arch/importIFC.py b/src/Mod/Arch/importIFC.py index 53a007657..14fa677d3 100644 --- a/src/Mod/Arch/importIFC.py +++ b/src/Mod/Arch/importIFC.py @@ -35,7 +35,7 @@ import os,time,tempfile,uuid,FreeCAD,Part,Draft,Arch,math,DraftVecUtils DEBUG = False -if open.__module__ == '__builtin__': +if open.__module__ in ['__builtin__','io']: pyopen = open # because we'll redefine open below # which IFC type must create which FreeCAD type diff --git a/src/Mod/Arch/importIFClegacy.py b/src/Mod/Arch/importIFClegacy.py index b55c9c478..4ccbf3f3b 100644 --- a/src/Mod/Arch/importIFClegacy.py +++ b/src/Mod/Arch/importIFClegacy.py @@ -56,7 +56,7 @@ supportedIfcTypes = ["IfcSite", "IfcBuilding", "IfcBuildingStorey", "IfcBeam", " "IfcPile", "IfcFooting", "IfcReinforcingBar", "IfcTendon"] # TODO : shading device not supported? -if open.__module__ == '__builtin__': +if open.__module__ in ['__builtin__','io']: pyopen = open # because we'll redefine open below def open(filename,skip=None): diff --git a/src/Mod/Arch/importOBJ.py b/src/Mod/Arch/importOBJ.py index f47c7512e..ba25d609a 100644 --- a/src/Mod/Arch/importOBJ.py +++ b/src/Mod/Arch/importOBJ.py @@ -40,7 +40,7 @@ else: p = Draft.precision() -if open.__module__ == '__builtin__': +if open.__module__ in ['__builtin__','io']: pythonopen = open def findVert(aVertex,aList): diff --git a/src/Mod/Arch/importSH3D.py b/src/Mod/Arch/importSH3D.py index 7fabdb2c7..e34ec8bcb 100644 --- a/src/Mod/Arch/importSH3D.py +++ b/src/Mod/Arch/importSH3D.py @@ -34,7 +34,7 @@ import os,zipfile,xml.sax,FreeCAD,Part,Draft,Arch,Mesh,tempfile,math,Sketcher DEBUG = True -if open.__module__ == '__builtin__': +if open.__module__ in ['__builtin__','io']: pyopen = open # because we'll redefine open below diff --git a/src/Mod/Arch/importWebGL.py b/src/Mod/Arch/importWebGL.py index d22ea5637..7f8489f73 100644 --- a/src/Mod/Arch/importWebGL.py +++ b/src/Mod/Arch/importWebGL.py @@ -116,7 +116,7 @@ template = """ """ -if open.__module__ == '__builtin__': +if open.__module__ in ['__builtin__','io']: pythonopen = open def export(exportList,filename): diff --git a/src/Mod/Draft/importAirfoilDAT.py b/src/Mod/Draft/importAirfoilDAT.py index 99a15df5c..0e384e6ba 100644 --- a/src/Mod/Draft/importAirfoilDAT.py +++ b/src/Mod/Draft/importAirfoilDAT.py @@ -34,7 +34,7 @@ import re, FreeCAD, FreeCADGui, Part, cProfile, os, string from FreeCAD import Vector, Base from Draft import makeWire -if open.__module__ == '__builtin__': +if open.__module__ in ['__builtin__','io']: pythonopen = open useDraftWire = True diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py index 9b5a32ff7..955caef9f 100644 --- a/src/Mod/Draft/importDXF.py +++ b/src/Mod/Draft/importDXF.py @@ -65,7 +65,7 @@ dxfReader = None dxfColorMap = None dxfLibrary = None -if open.__module__ == '__builtin__': +if open.__module__ in ['__builtin__','io']: pythonopen = open # to distinguish python built-in open function from the one declared here diff --git a/src/Mod/Draft/importOCA.py b/src/Mod/Draft/importOCA.py index 896d7f781..f8cb5769e 100644 --- a/src/Mod/Draft/importOCA.py +++ b/src/Mod/Draft/importOCA.py @@ -45,7 +45,7 @@ try: import FreeCADGui except ValueError: gui = False else: gui = True -if open.__module__ == '__builtin__': +if open.__module__ in ['__builtin__','io']: pythonopen = open params = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft") diff --git a/src/Mod/Draft/importSVG.py b/src/Mod/Draft/importSVG.py index fb4184565..74ecff8c2 100644 --- a/src/Mod/Draft/importSVG.py +++ b/src/Mod/Draft/importSVG.py @@ -55,7 +55,7 @@ else: gui = True try: draftui = FreeCADGui.draftToolBar except AttributeError: draftui = None -if open.__module__ == '__builtin__': +if open.__module__ in ['__builtin__','io']: pythonopen = open svgcolors = {