From bec8e1befd9c5b172abff9d45d3c8b2e362630b3 Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Tue, 22 Oct 2019 10:28:29 -0400 Subject: [PATCH] Draft: use string operator instead of numeric LGTM fix --- src/Mod/Draft/Draft.py | 16 ++++++++-------- src/Mod/Draft/DraftGeomUtils.py | 14 +++++++------- src/Mod/Draft/DraftGui.py | 14 +++++++------- src/Mod/Draft/DraftSnap.py | 4 ++-- src/Mod/Draft/getSVG.py | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index c6b0faff8b..aee64f4a2a 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -134,25 +134,25 @@ def getParam(param,default=None): t = getParamType(param) #print("getting param ",param, " of type ",t, " default: ",str(default)) if t == "int": - if default == None: + if default is None: default = 0 if param == "linewidth": return FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").GetInt("DefaultShapeLineWidth",default) return p.GetInt(param,default) elif t == "string": - if default == None: + if default is None: default = "" return p.GetString(param,default) elif t == "float": - if default == None: + if default is None: default = 0 return p.GetFloat(param,default) elif t == "bool": - if default == None: + if default is None: default = False return p.GetBool(param,default) elif t == "unsigned": - if default == None: + if default is None: default = 0 if param == "color": return FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").GetUnsigned("DefaultShapeLineColor",default) @@ -312,7 +312,7 @@ def autogroup(obj): def dimSymbol(symbol=None,invert=False): """returns the current dim symbol from the preferences as a pivy SoMarkerSet""" - if symbol == None: + if symbol is None: symbol = getParam("dimsymbol",0) from pivy import coin if symbol == 0: @@ -4558,10 +4558,10 @@ class _ViewProviderAngularDimension(_ViewProviderDraft): for i in range(arcsegs+1): p = self.circle.valueAt(self.circle.FirstParameter+((self.circle.LastParameter-self.circle.FirstParameter)/arcsegs)*i) if (p.sub(mp)).Length <= spacing: - if cut == None: + if cut is None: cut = i else: - if cut == None: + if cut is None: pts1.append([p.x,p.y,p.z]) else: pts2.append([p.x,p.y,p.z]) diff --git a/src/Mod/Draft/DraftGeomUtils.py b/src/Mod/Draft/DraftGeomUtils.py index e87f808aee..3bff3f2ecd 100644 --- a/src/Mod/Draft/DraftGeomUtils.py +++ b/src/Mod/Draft/DraftGeomUtils.py @@ -806,7 +806,7 @@ def sortEdgesOld(lEdges, aVertex=None): return [count]+linstances if (len(lEdges) < 2): - if aVertex == None: + if aVertex is None: return lEdges else: result = lookfor(aVertex,lEdges) @@ -829,7 +829,7 @@ def sortEdgesOld(lEdges, aVertex=None): return lEdges olEdges = [] # ol stands for ordered list - if aVertex == None: + if aVertex is None: for i in range(len(lEdges)*2) : if len(lEdges[i/2].Vertexes) > 1: result = lookfor(lEdges[i/2].Vertexes[i%2],lEdges) @@ -1073,7 +1073,7 @@ def findPerpendicular(point,edgeslist,force=None): edgeslist = edgeslist.Edges except: return None - if (force == None): + if (force is None): valid = None for edge in edgeslist: dist = findDistance(point,edge,strict=True) @@ -2268,12 +2268,12 @@ def getBoundaryAngles(angle,alist): lower = None for a in alist: if a < angle: - if lower == None: + if lower is None: lower = a else: if a > lower: lower = a - if lower == None: + if lower is None: lower = 0 for a in alist: if a > lower: @@ -2281,12 +2281,12 @@ def getBoundaryAngles(angle,alist): higher = None for a in alist: if a > angle: - if higher == None: + if higher is None: higher = a else: if a < higher: higher = a - if higher == None: + if higher is None: higher = 2*math.pi for a in alist: if a < higher: diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py index 05b8ba0e92..574a6e87eb 100644 --- a/src/Mod/Draft/DraftGui.py +++ b/src/Mod/Draft/DraftGui.py @@ -249,7 +249,7 @@ def displayExternal(internValue,decimals=None,dim='Length',showUnit=True,unit=No if dim == 'Length': q = FreeCAD.Units.Quantity(internValue,FreeCAD.Units.Length) if not unit: - if (decimals == None) and showUnit: + if (decimals is None) and showUnit: return q.UserString conversion = q.getUserPreferred()[1] uom = q.getUserPreferred()[2] @@ -261,7 +261,7 @@ def displayExternal(internValue,decimals=None,dim='Length',showUnit=True,unit=No return FreeCAD.Units.Quantity(internValue,FreeCAD.Units.Angle).UserString else: conversion = 1.0 - if decimals == None: + if decimals is None: decimals = 2 uom = "??" if not showUnit: @@ -915,16 +915,16 @@ class DraftToolBar: elif self.angleLock.isVisible() and self.angleLock.isChecked(): self.lengthValue.setFocus() self.lengthValue.selectAll() - elif f==None or f=="x": + elif (f is None) or (f == "x"): self.xValue.setFocus() self.xValue.selectAll() - elif f=="y": + elif f == "y": self.yValue.setFocus() self.yValue.selectAll() - elif f=="z": + elif f == "z": self.zValue.setFocus() self.zValue.selectAll() - elif f=="radius": + elif f == "radius": self.radiusValue.setFocus() self.radiusValue.selectAll() @@ -1973,7 +1973,7 @@ class DraftToolBar: FreeCADGui.runCommand("Draft_AutoGroup") def setAutoGroup(self,value=None): - if value == None: + if value is None: self.autogroup = None self.autoGroupButton.setText("None") self.autoGroupButton.setIcon(QtGui.QIcon.fromTheme('Draft_AutoGroup_off', diff --git a/src/Mod/Draft/DraftSnap.py b/src/Mod/Draft/DraftSnap.py index 495da631a4..6eb00ff9c2 100644 --- a/src/Mod/Draft/DraftSnap.py +++ b/src/Mod/Draft/DraftSnap.py @@ -407,7 +407,7 @@ class Snapper: winner = None fp = point for snap in snaps: - if (not snap) or (snap[0] == None): + if (not snap) or (snap[0] is None): pass #print("debug: Snapper: invalid snap point: ",snaps) else: @@ -1364,7 +1364,7 @@ class Snapper: def toggle(self,checked=None): "toggles the snap mode" if hasattr(self,"toolbarButtons"): - if checked == None: + if checked is None: self.masterbutton.toggle() elif checked: if hasattr(self,"savedButtonStates"): diff --git a/src/Mod/Draft/getSVG.py b/src/Mod/Draft/getSVG.py index b872bd6749..7d90a0d3d7 100644 --- a/src/Mod/Draft/getSVG.py +++ b/src/Mod/Draft/getSVG.py @@ -842,7 +842,7 @@ def getSVG(obj,scale=1,linewidth=0.35,fontsize=12,fillstyle="shape color",direct wiredEdges.extend(w.Edges) if len(wiredEdges) != len(obj.Shape.Edges): for i,e in enumerate(obj.Shape.Edges): - if (DraftGeomUtils.findEdge(e,wiredEdges) == None): + if (DraftGeomUtils.findEdge(e,wiredEdges) is None): svg += getPath([e],pathname='%s_nwe%04d' % \ (obj.Name,i)) else: