Should use "is None" instead of "== None"

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index 30412b79b744bafca142e342e032dd0aa86d8eb9..bfd5e6754909c0a7116114838f4648bea32dbb62 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -842,7 +842,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                for item in self.parent.list:
                        if item == self.parent.selection:
                                seenSelected = True
-                       if item.modelDisplayList == None:
+                       if item.modelDisplayList is None:
                                item.modelDisplayList = glGenLists(1);
                        if item.modelDirty:
                                item.modelDirty = False

diff --git a/Cura/gui/util/opengl.py b/Cura/gui/util/opengl.py
index 18234c586aa951c45115af9164cc34a5fad01749..41ff00cdb9569119fbe3780ada2ac8ac3d0d8114 100644 (file)
--- a/Cura/gui/util/opengl.py
+++ b/Cura/gui/util/opengl.py
@@ -66,7 +66,7 @@ def DrawMachine(machineSize):
                glBlendFunc(GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR)
 
                global platformMesh
-               if platformMesh == None:
+               if platformMesh is None:
                        platformMesh = meshLoader.loadMesh(getPathForMesh('ultimaker_platform.stl'))
                        platformMesh.setRotateMirror(0, False, False, False, False, False)
 
@@ -456,7 +456,7 @@ def DrawGCodeLayer(layer):
                                glVertex3f(vv3.x, vv3.y, vv3.z - zOffset)
                                glVertex3f(vv2.x, vv2.y, vv2.z - zOffset)
                                glEnd()
-                               if prevNormal != None:
+                               if prevNormal is not None:
                                        n = (normal + prevNormal)
                                        n.normalize()
                                        vv4 = v0 + n * lineWidth

diff --git a/Cura/gui/util/taskbar.py b/Cura/gui/util/taskbar.py
index c3dc4f3d4f95909a93f72358ae25456305902cf4..31df78e368303e6aa5c11d3c89ec14678a0be235 100644 (file)
--- a/Cura/gui/util/taskbar.py
+++ b/Cura/gui/util/taskbar.py
@@ -23,20 +23,20 @@ except:
        ITaskbarList3 = None
 
 def setBusy(frame, busy):
-       if ITaskbarList3 != None:
+       if ITaskbarList3 is not None:
                if busy:
                        ITaskbarList3.SetProgressState(frame.GetHandle(), TBPF_INDETERMINATE)
                else:
                        ITaskbarList3.SetProgressState(frame.GetHandle(), TBPF_NOPROGRESS)
 
 def setPause(frame, pause):
-       if ITaskbarList3 != None:
+       if ITaskbarList3 is not None:
                if pause:
                        ITaskbarList3.SetProgressState(frame.GetHandle(), TBPF_PAUSED)
                else:
                        ITaskbarList3.SetProgressState(frame.GetHandle(), TBPF_NORMAL)
 
 def setProgress(frame, done, total):
-       if ITaskbarList3 != None:
+       if ITaskbarList3 is not None:
                ITaskbarList3.SetProgressState(frame.GetHandle(), TBPF_NORMAL)
                ITaskbarList3.SetProgressValue(frame.GetHandle(), done, total)

diff --git a/Cura/plugins/pauseAtZ.py b/Cura/plugins/pauseAtZ.py
index 4404884aeea99fd10c885e07a880adfd1197ed7a..1771e03f804f025af3fdc0fe8190dd86278bcae6 100644 (file)
--- a/Cura/plugins/pauseAtZ.py
+++ b/Cura/plugins/pauseAtZ.py
@@ -14,7 +14,7 @@ def getValue(line, key, default = None):
                return default
        subPart = line[line.find(key) + 1:]
        m = re.search('^[0-9]+\.?[0-9]*', subPart)
-       if m == None:
+       if m is None:
                return default
        try:
                return float(m.group(0))

diff --git a/Cura/util/mesh.py b/Cura/util/mesh.py
index 6be227c6828cf28ccf800e3ae8a7651519f88945..857d62011da477d743cf2b5bb781335d033101ba 100644 (file)
--- a/Cura/util/mesh.py
+++ b/Cura/util/mesh.py
@@ -106,7 +106,7 @@ class mesh(object):
                                tree.insert(e)
                        else:
                                removeDict[idx] = q[0].idx
-                       if callback != None and (idx % 100) == 0:
+                       if callback is not None and (idx % 100) == 0:
                                callback(idx)
                #print "%f: " % (time.time() - t0), "Marked %d duplicate vertexes for removal." % (len(removeDict))
 

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 113c6cf15bbcaf91b4fb2fbb80c58848812a4749..6118720f99cad2be6308631cbee41fead51551da 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -344,7 +344,7 @@ def getPreference(name):
        if name in tempOverride:
                return unicode(tempOverride[name])
        global globalPreferenceParser
-       if globalPreferenceParser == None:
+       if globalPreferenceParser is None:
                globalPreferenceParser = ConfigParser.ConfigParser()
                globalPreferenceParser.read(getPreferencePath())
        if not globalPreferenceParser.has_option('preference', name):

diff --git a/Cura/util/validators.py b/Cura/util/validators.py
index 18812cd96ce90640ae08f886fdbd0da636504ad0..d226c6065d5afd8f4745f6481c7274025a6ee685 100644 (file)
--- a/Cura/util/validators.py
+++ b/Cura/util/validators.py
@@ -20,7 +20,7 @@ class validFloat(object):
        def validate(self):
                try:
                        f = float(eval(self.setting.GetValue().replace(',','.'), {}, {}))
-                       if self.minValue != None and f < self.minValue:
+                       if self.minValue is not None and f < self.minValue:
                                return ERROR, 'This setting should not be below ' + str(self.minValue)
                        if self.maxValue != None and f > self.maxValue:
                                return ERROR, 'This setting should not be above ' + str(self.maxValue)