support py3

lib/python/usdNodeGraph/core/cel/core.py

@@ -125,5 +125,5 @@ def _resolveTempList(templ):
         '/root/world/lgt_rim',
     ]
 
-    print resolveCELString(s, all)
+    print(resolveCELString(s, all))
 

lib/python/usdNodeGraph/core/node/node.py

@@ -73,11 +73,11 @@ def setParamDefault(cls, nodeType, paramName, value):
 
     @classmethod
     def getAllNodeClassNames(cls):
-        return cls._nodeTypes.keys()
+        return list(cls._nodeTypes.keys())
 
     @classmethod
     def getAllNodeClass(cls):
-        return cls._nodeTypes.values()
+        return list(cls._nodeTypes.values())
 
     @classmethod
     def setParameterDefault(cls, parameterName, value):
@@ -129,7 +129,7 @@ def _initParameters(self):
             'fillColor': Color4fParameter(name='fillColor', parent=self, builtIn=True, hints={'showEditor': 'False', 'tab': 'None'}, defaultValue=self.convertColorToFloat(self.fillNormalColor)),
             'borderColor': Color4fParameter(name='borderColor', parent=self, builtIn=True, hints={'showEditor': 'False', 'tab': 'None'}, defaultValue=self.convertColorToFloat(self.borderNormalColor)),
         }
-        self._parametersName = self._parameters.keys()
+        self._parametersName = list(self._parameters.keys())
         self._parametersName.sort()
 
     def _initDefaults(self):

lib/python/usdNodeGraph/core/node/usdNode.py

@@ -9,6 +9,7 @@
 from usdNodeGraph.utils.const import consts
 from usdNodeGraph.core.state.core import GraphState
 from usdNodeGraph.ui.utils.log import LogWindow
+from usdNodeGraph.utils.pyversion import *
 
 ATTR_CHECK_OP = consts(
     EXACT='exact',
@@ -84,7 +85,7 @@ def getMetadataValue(self, key, default=None):
         return value
 
     def getMetadataKeys(self):
-        return self._metadata.keys()
+        return list(self._metadata.keys())
 
     def getMetadatas(self):
         return self._metadata
@@ -107,7 +108,7 @@ def execute(self, stage, prim):
             self._beforeExecute(stage, prim)
             try:
                 stage, prim = self._execute(stage, prim)
-            except Exception as e:
+            except(Exception) as e:
                 traceback.print_exc()
                 LogWindow.error('Node Execute Error: {}\n{}'.format(self.name(), e))
             self._afterExecute(stage, prim)
@@ -151,7 +152,7 @@ def getPrimPath(self):
         return self._primPaths
 
     def getExecuteParams(self):
-        parameters = self._parameters.values()
+        parameters = list(self._parameters.values())
         params = [
             param for param in parameters if (
                     (param.isOverride() or param.hasMetadatas())
@@ -215,11 +216,11 @@ def registerNode(cls, nodeObjectClass):
 
     @classmethod
     def getIgnorePrimInfoKeys(cls):
-        return cls._metadataNodeMap.keys()
+        return list(cls._metadataNodeMap.keys())
 
     @classmethod
     def getNodes(cls):
-        return cls._metadataNodeMap.values()
+        return list(cls._metadataNodeMap.values())
 
     @classmethod
     def getMetadataNodeClass(cls, key):

lib/python/usdNodeGraph/core/parameter/basic.py

@@ -31,7 +31,7 @@ def registerParameterWidget(cls, typeName, parameterWidget):
 
     @classmethod
     def getParameterTypes(cls):
-        return cls._parametersMap.keys()
+        return list(cls._parametersMap.keys())
 
     @classmethod
     def getParameter(cls, typeName):
@@ -77,7 +77,7 @@ def convertTimeSamplesToPy(cls, timeSamples):
 
     @classmethod
     def getIntervalValue(cls, timeSamples, time):
-        keys = timeSamples.keys()
+        keys = list(timeSamples.keys())
         keys.sort()
         if time <= keys[0]:
             return timeSamples[keys[0]]
@@ -260,7 +260,7 @@ def hasMetadata(self, key):
         return key in self._metadata
 
     def getMetadataKyes(self):
-        return self._metadata.keys()
+        return list(self._metadata.keys())
 
     def getMetadataValue(self, key, default=None):
         strValue = self._metadata.get(key, default)
@@ -332,7 +332,7 @@ def removeKey(self, time, emitSignal=True):
         time = float(time)
         if self.hasKey() and time in self._overrideTimeSamples.keys():
             self._overrideTimeSamples.pop(time)
-            if len(self._overrideTimeSamples.keys()) == 0:
+            if len(list(self._overrideTimeSamples.keys())) == 0:
                 self._overrideTimeSamples = None
             if emitSignal:
                 self.valueChanged.emit(self)

lib/python/usdNodeGraph/core/parse/_xml.py

@@ -14,7 +14,7 @@ def fixedWritexml(self, writer, indent="", addindent="", newl=""):
     writer.write(indent+"<" + self.tagName)
 
     attrs = self._get_attributes()
-    a_names = attrs.keys()
+    a_names = list(attrs.keys())
     a_names.sort()
 
     for a_name in a_names:

lib/python/usdNodeGraph/module/sqt.py

@@ -26,5 +26,5 @@ def to_unicode(qstring):
 
 # for pycharm auto complete
 if False:
-    from PyQt5 import QtSvg, QtCharts, QtOpenGL, QtWidgets, QtCore, QtGui
+    from PySide2 import QtSvg, QtCharts, QtOpenGL, QtWidgets, QtCore, QtGui
 

lib/python/usdNodeGraph/ui/graph/nodeItem/nodeItem.py

@@ -426,7 +426,7 @@ def _updateLabelText(self):
             pyString = ' '.join(expString.split(' ')[1:]).replace(']', '')
             try:
                 result = eval(pyString, globals(), Node._expressionMap)
-            except Exception, e:
+            except(Exception) as e:
                 result = e
             label = label.replace(expString, str(result))
 

lib/python/usdNodeGraph/ui/graph/view.py

@@ -449,7 +449,7 @@ def _formatSwitchClicked(self):
     def _getContextMenus(self):
         actions = []
         groupDict = Node.getNodesByGroup()
-        groups = groupDict.keys()
+        groups = list(groupDict.keys())
         groups.sort()
         for group in groups:
             nodeActions = []
@@ -738,7 +738,7 @@ def _getIntoPrim(self, primSpec, upNode):
             self._getIntoPrim(child, node)
 
     def _getPrimAttributes(self, primSpec, upNode):
-        attrs = primSpec.attributes.keys()
+        attrs = list(primSpec.attributes.keys())
         if len(attrs) == 0:
             return upNode
 
@@ -757,7 +757,7 @@ def _getPrimAttributes(self, primSpec, upNode):
         return upNode
 
     def _getPrimRelationships(self, primSpec, upNode):
-        attrs = primSpec.relationships.keys()
+        attrs = list(primSpec.relationships.keys())
         if len(attrs) == 0:
             return upNode
 
@@ -819,7 +819,7 @@ def _afterNodeNameChanged(self, node):
     def _getUniqueName(self, name):
         # nodes = self.allNodes()
         # names = [n.name() for n in nodes]
-        names = self._allNodes.values()
+        names = list(self._allNodes.values())
 
         match = re.match(NODE_NAME_PATTERN, name)
         if match:
@@ -848,12 +848,20 @@ def _getUniqueName(self, name):
         return name, suffix, index
 
     def _executeLayerNodes(self, stage, nodes):
-        nodes.sort(lambda n1,n2: cmp(n1.pos().y(),n2.pos().y()))
+        from functools import cmp_to_key
+        nodes.sort(key=cmp_to_key(self._node_cmp))
         for node in nodes:
             stage, _ = node.execute(stage, None)
 
         return stage
 
+    def _node_cmp(self, n1, n2):
+        if n1.pos().y() > n2.pos().y():
+            return 1
+        if n1.pos().y() < n2.pos().y():
+            return -1
+        return 0
+
     def _executeNode(self, node, stage, prim):
         stage, prim = node.execute(stage, prim)
         if node.Class() == 'VariantSwitch':
@@ -1071,7 +1079,7 @@ def updateSelectedNodesPipe(self):
             pipe.updatePath()
 
     def allNodes(self):
-        return self._allNodes.keys()
+        return list(self._allNodes.keys())
         # nodes = [item for item in self.items() if isinstance(item, NodeItem)]
         # return nodes
 
@@ -1276,7 +1284,7 @@ def _exportToFile(self, exportFile):
             QtWidgets.QMessageBox.warning(None, 'Warning', 'This layer can\'t be exported!')
             return
         stage = self._executeAllToStage()
-        print exportFile
+        print(exportFile)
         stage.GetRootLayer().Export(exportFile)
 
     def exportToFile(self):

lib/python/usdNodeGraph/ui/nodeGraph.py

@@ -139,7 +139,7 @@ def _createSignal(self):
     def _getNodeActions(self):
         actions = []
         groupDict = Node.getNodesByGroup()
-        groups = groupDict.keys()
+        groups = list(groupDict.keys())
         groups.sort()
         for group in groups:
             nodeActions = []

lib/python/usdNodeGraph/ui/parameter/param_panel/metadata.py

@@ -40,7 +40,7 @@ def updateView(self):
 
         self.clearContents()
 
-        keys = self.metadatas.keys()
+        keys = list(self.metadatas.keys())
         keys.sort()
 
         self.setRowCount(len(keys))

lib/python/usdNodeGraph/ui/parameter/param_panel/panel.py

@@ -564,7 +564,7 @@ def _numChanged(self):
 
     def _removeExtraWidgets(self):
         num = int(self.widgetNumEdit.text())
-        indexs = range(len(self._widgets))
+        indexs = list(range(len(self._widgets)))
         indexs.sort(reverse=True)
         for i in indexs:
             if i + 1 > num:

lib/python/usdNodeGraph/ui/parameter/param_widget/string.py

@@ -1,5 +1,6 @@
 from .basic import ParameterWidget, VecWidget, VecParameterWidget
 from usdNodeGraph.module.sqt import *
+from usdNodeGraph.utils.pyversion import *
 
 
 class StringParameterWidget(VecWidget, VecParameterWidget):

lib/python/usdNodeGraph/ui/plugin.py

@@ -47,7 +47,7 @@ def loadPlugins():
     # Load each plugin in alphabetical order by name. For each plugin, load all
     # of its containers in alphabetical order by type name.
     allContainers = []
-    for plugin in sorted(plugins.keys(), key=lambda plugin: plugin.name):
+    for plugin in sorted(list(plugins.keys()), key=lambda plugin: plugin.name):
         plugin.Load()
         pluginContainerTypes = sorted(
             plugins[plugin], key=lambda containerType: containerType.typeName)

lib/python/usdNodeGraph/utils/pyversion.py

@@ -0,0 +1,13 @@
+import sys
+
+PY_MAIN_VERSION = sys.version_info[0]
+
+if PY_MAIN_VERSION == 3:
+    from imp import reload
+    basestring = str
+    unicode = str
+    long = int
+else:
+    reload = reload
+    basestring = basestring
+

lib/python/usdNodeGraph/utils/res/resource.py

@@ -4,6 +4,7 @@
 import os
 import sys
 from usdNodeGraph.module.sqt import *
+from usdNodeGraph.utils.pyversion import *
 
 
 RES_FOLDER = '/'.join(__file__.replace('\\', '/').split('/')[:-3]) + '/resource'

lib/python/usdNodeGraph/utils/settings.py

@@ -3,18 +3,7 @@
 import os
 from os.path import join as opj
 from usdNodeGraph.module.sqt import QtCore, to_unicode
-import sys
-
-PY_MAIN_VERSION = sys.version_info[0]
-
-if PY_MAIN_VERSION == 3:
-    from imp import reload
-    basestring = str
-    unicode = str
-    long = int
-else:
-    reload = reload
-    basestring = basestring
+from .pyversion import *
 
 
 User_Setting = QtCore.QSettings(