warning fixes

meshroom/core/graph.py

@@ -561,7 +561,7 @@ class Graph(BaseObject):
         candidates = self.findNodeCandidates('^' + nodeExpr)
         if not candidates:
             raise KeyError('No node candidate for "{}"'.format(nodeExpr))
-        elif len(candidates) > 1:
+        if len(candidates) > 1:
             raise KeyError('Multiple node candidates for "{}": {}'.format(nodeExpr, str([c.name for c in candidates])))
         return candidates[0]
 
@@ -681,11 +681,11 @@ class Graph(BaseObject):
                 # (u,v) is a tree edge
                 self.dfsVisit(v, visitor, colors, nodeChildren, longestPathFirst)  # TODO: avoid recursion
             elif colors[v] == GRAY:
+                # (u,v) is a back edge
                 visitor.backEdge((u, v), self)
-                pass  # (u,v) is a back edge
             elif colors[v] == BLACK:
+                # (u,v) is a cross or forward edge
                 visitor.forwardOrCrossEdge((u, v), self)
-                pass  # (u,v) is a cross or forward edge
             visitor.finishEdge((u, v), self)
         colors[u] = BLACK
         visitor.finishVertex(u, self)
@@ -740,8 +740,7 @@ class Graph(BaseObject):
         def finishEdge(edge, graph):
             if edge[0].hasStatus(Status.SUCCESS) or edge[1].hasStatus(Status.SUCCESS):
                 return
-            else:
-                edges.append(edge)
+            edges.append(edge)
 
         visitor.finishVertex = finishVertex
         visitor.finishEdge = finishEdge

meshroom/core/node.py

@@ -547,7 +547,7 @@ class BaseNode(BaseObject):
 
     def _buildCmdVars(self):
         def _buildAttributeCmdVars(cmdVars, name, attr):
-            if attr.attributeDesc.group != None:
+            if attr.attributeDesc.group is not None:
                 # if there is a valid command line "group"
                 v = attr.getValueStr()
                 cmdVars[name] = '--{name} {value}'.format(name=name, value=v)

meshroom/nodes/aliceVision/CameraInit.py

@@ -258,7 +258,7 @@ The metadata needed are:
             os.makedirs(os.path.join(tmpCache, node.internalFolder))
             self.createViewpointsFile(node, additionalViews)
             cmd = self.buildCommandLine(node.chunks[0])
-            logging.debug(' - commandLine:', cmd)
+            logging.debug(' - commandLine: {}'.format(cmd))
             proc = psutil.Popen(cmd, stdout=None, stderr=None, shell=True)
             stdout, stderr = proc.communicate()
             # proc.wait()

meshroom/nodes/aliceVision/LdrToHdrCalibration.py

@@ -9,7 +9,7 @@ def findMetadata(d, keys, defaultValue):
     for key in keys:
         v = d.get(key, None)
         k = key.lower()
-        if v != None:
+        if v is not None:
             return v
         for dk, dv in d.iteritems():
             dkm = dk.lower().replace(" ", "")

meshroom/nodes/aliceVision/LdrToHdrMerge.py

@@ -1,7 +1,6 @@
 __version__ = "2.0"
 
 import json
-import os
 
 from meshroom.core import desc
 
@@ -10,7 +9,7 @@ def findMetadata(d, keys, defaultValue):
     for key in keys:
         v = d.get(key, None)
         k = key.lower()
-        if v != None:
+        if v is not None:
             return v
         for dk, dv in d.iteritems():
             dkm = dk.lower().replace(" ", "")

meshroom/nodes/aliceVision/LdrToHdrSampling.py

@@ -10,7 +10,7 @@ def findMetadata(d, keys, defaultValue):
     for key in keys:
         v = d.get(key, None)
         k = key.lower()
-        if v != None:
+        if v is not None:
             return v
         for dk, dv in d.iteritems():
             dkm = dk.lower().replace(" ", "")

meshroom/nodes/aliceVision/StructureFromMotion.py

@@ -1,8 +1,5 @@
 __version__ = "2.0"
 
-import json
-import os
-
 from meshroom.core import desc