From c6c1828c1592cd4a95cecbe37eeb2e280c8bd10f Mon Sep 17 00:00:00 2001 From: DeepSOIC Date: Thu, 23 Nov 2017 11:58:18 +0300 Subject: [PATCH] Py3: more fix "err has no attribute message" --- CompoundFilter2.py | 2 +- FuseCompound2.py | 2 +- lattice2BaseFeature.py | 2 +- lattice2Downgrade.py | 2 +- lattice2Executer.py | 3 ++- lattice2ExposeLinkSub.py | 6 ++---- lattice2Markers.py | 2 +- lattice2ParaSeries.py | 2 +- lattice2Slice.py | 2 +- lattice2SubstituteObject.py | 4 ++-- 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/CompoundFilter2.py b/CompoundFilter2.py index 262b0b0..9c22c97 100644 --- a/CompoundFilter2.py +++ b/CompoundFilter2.py @@ -214,7 +214,7 @@ class _ViewProviderCompoundFilter: if self.Object.Stencil: self.Object.Stencil.ViewObject.show() except Exception as err: - App.Console.PrintError("Error in onDelete: " + err.message) + App.Console.PrintError("Error in onDelete: " + str(err)) return True def CreateCompoundFilter(name): diff --git a/FuseCompound2.py b/FuseCompound2.py index 289955a..bbfb3ff 100644 --- a/FuseCompound2.py +++ b/FuseCompound2.py @@ -95,7 +95,7 @@ class _ViewProviderFuseCompound: try: screen(self.Object.Base).ViewObject.show() except Exception as err: - FreeCAD.Console.PrintError("Error in onDelete: " + err.message) + FreeCAD.Console.PrintError("Error in onDelete: " + str(err)) return True # -------------------------- /document object -------------------------------------------------- diff --git a/lattice2BaseFeature.py b/lattice2BaseFeature.py index 5a50cd0..066487d 100644 --- a/lattice2BaseFeature.py +++ b/lattice2BaseFeature.py @@ -290,7 +290,7 @@ class ViewProviderLatticeFeature: child.ViewObject.show() except Exception as err: # catch all exceptions, because we don't want to prevent deletion if something goes wrong - FreeCAD.Console.PrintError("Error in onDelete: " + err.message) + FreeCAD.Console.PrintError("Error in onDelete: " + str(err)) return True diff --git a/lattice2Downgrade.py b/lattice2Downgrade.py index df6b17b..e7dbfe9 100644 --- a/lattice2Downgrade.py +++ b/lattice2Downgrade.py @@ -168,7 +168,7 @@ class _ViewProviderLatticeDowngrade: try: screen(self.Object.Base).ViewObject.show() except Exception as err: - FreeCAD.Console.PrintError("Error in onDelete: " + err.message) + FreeCAD.Console.PrintError("Error in onDelete: " + str(err)) return True diff --git a/lattice2Executer.py b/lattice2Executer.py index 35cca41..77ab0d6 100644 --- a/lattice2Executer.py +++ b/lattice2Executer.py @@ -41,7 +41,7 @@ def executeFeature(obj): raise except Exception as err: try: - error(obj,err.message) + error(obj,str(err)) except CancelError: obj.Document.abortTransaction() raise @@ -97,4 +97,5 @@ def _showMsg(obj, message, forceMessage, _type): class CancelError(Exception): def __init__(self): self.message = "Canceled by user" + self.args = (self.message,) self.isCancelError = True \ No newline at end of file diff --git a/lattice2ExposeLinkSub.py b/lattice2ExposeLinkSub.py index d213e92..3ff2688 100644 --- a/lattice2ExposeLinkSub.py +++ b/lattice2ExposeLinkSub.py @@ -90,10 +90,8 @@ def cmdExposeLinkSubs(): ExposeLinkSub(obj, propname) cnt += 1 except Exception as err: - Executer.warning(None,"Attempting to expose sublink property %prop of %feat caused an error:\n%err" - .replace("%prop",propname) - .replace("%feat",obj.Name) - .replace("%err",err.message) ) + Executer.warning(None,"Attempting to expose sublink property {prop} of {feat} caused an error:\n{err}" + .format(prop= propname, feat= obj.Name, err= str(err)) ) if cnt == 0: raise ValueError("No links to expose were found.") except Exception: diff --git a/lattice2Markers.py b/lattice2Markers.py index 14555f2..305cce5 100644 --- a/lattice2Markers.py +++ b/lattice2Markers.py @@ -70,7 +70,7 @@ def loadShape(shapeID): sh = sh.childShapes()[0] f.close() except Exception as err: - FreeCAD.Console.PrintError('Failed to load standard shape "'+shapeID+'". \n' + err.message + '\n') + FreeCAD.Console.PrintError('Failed to load standard shape "'+shapeID+'". \n' + str(err) + '\n') sh = Part.Point() #Create at least something! _ShapeDict[shapeID] = sh return sh diff --git a/lattice2ParaSeries.py b/lattice2ParaSeries.py index 9849223..ff50492 100644 --- a/lattice2ParaSeries.py +++ b/lattice2ParaSeries.py @@ -147,7 +147,7 @@ class LatticeParaSeries(lattice2BaseFeature.LatticeFeature): App.Console.PrintError("{obj}: failed to read out parameter '{param}': {err}\n" .format(obj= selfobj.Name, param= refstr, - err= err.message)) + err= str(err))) defvalues.append(val) N_params = len(defvalues) if N_params == 0: diff --git a/lattice2Slice.py b/lattice2Slice.py index d7c2a52..2cc7d10 100644 --- a/lattice2Slice.py +++ b/lattice2Slice.py @@ -132,7 +132,7 @@ class ViewProviderLatticeSlice: screen(self.Object.Base).ViewObject.show() screen(self.Object.Tool).ViewObject.show() except Exception as err: - FreeCAD.Console.PrintError("Error in onDelete: " + err.message) + FreeCAD.Console.PrintError("Error in onDelete: " + str(err)) return True # -------------------------- /document object -------------------------------------------------- diff --git a/lattice2SubstituteObject.py b/lattice2SubstituteObject.py index d76b70c..b1345e2 100644 --- a/lattice2SubstituteObject.py +++ b/lattice2SubstituteObject.py @@ -106,7 +106,7 @@ class CommandSubstituteObject: mb = QtGui.QMessageBox() mb.setIcon(mb.Icon.Warning) mb.setText(translate("Lattice2_SubstituteObject", "An error occured while substituting object:", None)+ u"\n" - + unicode(err.message)) + + str(err)) mb.setWindowTitle(translate("Lattice2_SubstituteObject","Error", None)) mb.exec_() App.ActiveDocument.abortTransaction() @@ -119,7 +119,7 @@ class CommandSubstituteObject: sel[0].Object.ViewObject.Visibility = True sel[1].Object.ViewObject.Visibility = old_was_visible except Exception as err: - App.Console.PrintError("SubstituteFeature: error when changing visibilities: "+err.message+"\n") + App.Console.PrintError("SubstituteFeature: error when changing visibilities: "+str(err)+"\n") else: mb = QtGui.QMessageBox() mb.setIcon(mb.Icon.Warning)