imports clean up

jchanvfx · jchanvfx · commit 6d309086d220 · 2021-03-30T23:01:01.000+13:00
diff --git a/NodeGraphQt/__init__.py b/NodeGraphQt/__init__.py
@@ -76,8 +76,7 @@ def __init__(self):
 try:
     from Qt import QtWidgets, QtGui, QtCore, QtCompat, QtOpenGL
 except ImportError as ie:
-    print('NodeGraphQt: Can\'t import Qt module please install "Qt.py"\n'
-          'pip install Qt.py')
+    print('NodeGraphQt: Please install "Qt.py" : pip install Qt.py')
     raise ImportError(ie)
 
 from .base.graph import NodeGraph, SubGraph
diff --git a/NodeGraphQt/base/commands.py b/NodeGraphQt/base/commands.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
+from Qt import QtWidgets
+
 from .utils import minimize_node_ref_count
-from .. import QtWidgets
 from ..constants import IN_PORT, OUT_PORT
 
 
diff --git a/NodeGraphQt/base/graph.py b/NodeGraphQt/base/graph.py
@@ -1,11 +1,12 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
+import copy
 import gc
 import json
 import os
 import re
 
-import copy
+from Qt import QtCore, QtWidgets, QtGui
 
 from .commands import (NodeAddedCmd,
                        NodeRemovedCmd,
@@ -16,7 +17,6 @@
 from .model import NodeGraphModel
 from .node import NodeObject, BaseNode
 from .port import Port
-from .. import QtCore, QtWidgets, QtGui
 from ..constants import (DRAG_DROP_ID,
                          PIPE_LAYOUT_CURVED,
                          PIPE_LAYOUT_STRAIGHT,
diff --git a/NodeGraphQt/base/menu.py b/NodeGraphQt/base/menu.py
@@ -1,7 +1,8 @@
 #!/usr/bin/python
 from distutils.version import LooseVersion
 
-from .. import QtGui, QtCore
+from Qt import QtGui, QtCore
+
 from ..errors import NodeMenuError
 from ..widgets.actions import BaseMenu, GraphAction, NodeAction
 
diff --git a/NodeGraphQt/base/utils.py b/NodeGraphQt/base/utils.py
@@ -1,7 +1,8 @@
 #!/usr/bin/python
 from distutils.version import LooseVersion
 
-from .. import QtGui, QtCore
+from Qt import QtGui, QtCore
+
 from ..constants import (PIPE_LAYOUT_CURVED,
                          PIPE_LAYOUT_STRAIGHT,
                          PIPE_LAYOUT_ANGLE,
diff --git a/NodeGraphQt/qgraphics/node_abstract.py b/NodeGraphQt/qgraphics/node_abstract.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from .. import QtCore, QtWidgets
+from Qt import QtCore, QtWidgets
 
 from ..constants import (Z_VAL_NODE, NODE_WIDTH, NODE_HEIGHT, ITEM_CACHE_MODE)
 
diff --git a/NodeGraphQt/qgraphics/node_backdrop.py b/NodeGraphQt/qgraphics/node_backdrop.py
@@ -1,12 +1,13 @@
 #!/usr/bin/python
 
-from .. import QtGui, QtCore, QtWidgets
-from ..constants import (Z_VAL_PIPE,
-                         NODE_SEL_COLOR,
-                         NODE_SEL_BORDER_COLOR)
+from Qt import QtGui, QtCore, QtWidgets
+
 from .node_abstract import AbstractNodeItem
 from .pipe import Pipe
 from .port import PortItem
+from ..constants import (Z_VAL_PIPE,
+                         NODE_SEL_COLOR,
+                         NODE_SEL_BORDER_COLOR)
 
 
 class BackdropSizer(QtWidgets.QGraphicsItem):
diff --git a/NodeGraphQt/qgraphics/node_text_item.py b/NodeGraphQt/qgraphics/node_text_item.py
@@ -1,4 +1,4 @@
-from .. import QtWidgets, QtCore, QtGui
+from Qt import QtWidgets, QtCore, QtGui
 
 
 class NodeTextItem(QtWidgets.QGraphicsTextItem):
diff --git a/NodeGraphQt/widgets/node_space_bar.py b/NodeGraphQt/widgets/node_space_bar.py
@@ -1,5 +1,6 @@
-from .. import QtWidgets, QtCore
-from . stylesheet import STYLE_SLASH_BUTTON, STYLE_NODE_BUTTON
+from Qt import QtWidgets, QtCore
+
+from .stylesheet import STYLE_SLASH_BUTTON, STYLE_NODE_BUTTON
 
 
 class node_space_bar(QtWidgets.QWidget):
diff --git a/NodeGraphQt/widgets/node_tree.py b/NodeGraphQt/widgets/node_tree.py
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-from .. import QtWidgets, QtCore
-from ..constants import DRAG_DROP_ID
+from Qt import QtWidgets, QtCore
 
+from ..constants import DRAG_DROP_ID
 
 TYPE_NODE = QtWidgets.QTreeWidgetItem.UserType + 1
 TYPE_CATEGORY = QtWidgets.QTreeWidgetItem.UserType + 2
diff --git a/NodeGraphQt/widgets/properties.py b/NodeGraphQt/widgets/properties.py
@@ -1,8 +1,9 @@
 #!/usr/bin/python
 from collections import defaultdict
 
+from Qt import QtWidgets, QtCore, QtGui
+
 from .dialogs import FileDialog
-from .. import QtWidgets, QtCore, QtGui
 from ..constants import (NODE_PROP_QLABEL,
                          NODE_PROP_QLINEEDIT,
                          NODE_PROP_QTEXTEDIT,
diff --git a/NodeGraphQt/widgets/properties_bin.py b/NodeGraphQt/widgets/properties_bin.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from .. import QtWidgets, QtCore, QtGui, QtCompat
+from Qt import QtWidgets, QtCore, QtGui, QtCompat
 
 from .properties import NodePropWidget
 
diff --git a/NodeGraphQt/widgets/tab_search.py b/NodeGraphQt/widgets/tab_search.py
@@ -2,8 +2,9 @@
 import re
 from collections import OrderedDict
 
+from Qt import QtCore, QtWidgets, QtGui
+
 from .stylesheet import STYLE_TABSEARCH, STYLE_TABSEARCH_LIST, STYLE_QMENU
-from .. import QtCore, QtWidgets, QtGui
 
 
 class TabSearchCompleter(QtWidgets.QCompleter):
diff --git a/NodeGraphQt/widgets/viewer.py b/NodeGraphQt/widgets/viewer.py
@@ -2,10 +2,11 @@
 # -*- coding: utf-8 -*-
 import math
 
+from Qt import QtGui, QtCore, QtWidgets, QtOpenGL
+
 from .dialogs import BaseDialog, FileDialog
 from .scene import NodeScene
 from .tab_search import TabSearchMenuWidget
-from .. import QtGui, QtCore, QtWidgets, QtOpenGL
 from ..base.menu import BaseMenu
 from ..constants import (IN_PORT, OUT_PORT,
                          PIPE_LAYOUT_CURVED)
diff --git a/docs/examples/ex_node.rst b/docs/examples/ex_node.rst
@@ -89,7 +89,7 @@ Here's an example to embed a custom widget where we subclass the
     :linenos:
     :emphasize-lines: 38, 96, 97
 
-    from NodeGraphQt import QtCore, QtWidgets, BaseNode, NodeBaseWidget
+    from Qt import QtCore, QtWidgets, BaseNode, NodeBaseWidget
 
     class MyCustomWidget(QtWidgets.QWidget):
         """
diff --git a/example.py b/example.py
@@ -2,15 +2,14 @@
 # -*- coding: utf-8 -*-
 import os
 
+from Qt import QtCore, QtGui, QtWidgets
+
 from NodeGraphQt import (NodeGraph,
                          BaseNode,
                          BackdropNode,
-                         setup_context_menu)
-from NodeGraphQt import (QtCore,
-                         QtGui,
-                         QtWidgets,
                          PropertiesBinWidget,
-                         NodeTreeWidget)
+                         NodeTreeWidget,
+                         setup_context_menu)
 
 # import example nodes from the "example_nodes" package
 from example_nodes import basic_nodes, widget_nodes
diff --git a/example_auto_nodes/node_base/auto_node.py b/example_auto_nodes/node_base/auto_node.py
@@ -1,8 +1,11 @@
-from NodeGraphQt import BaseNode, Port, QtCore, QtWidgets, QtGui
-from . utils import update_node_down_stream, get_data_type, CryptoColors
-import traceback
 import copy
 import time
+import traceback
+
+from Qt import QtCore, QtWidgets, QtGui
+
+from NodeGraphQt import BaseNode, Port
+from .utils import update_node_down_stream, get_data_type, CryptoColors
 
 
 class AutoNode(BaseNode, QtCore.QObject):
diff --git a/example_auto_nodes/node_base/module_node.py b/example_auto_nodes/node_base/module_node.py
@@ -1,4 +1,5 @@
 import inspect
+
 from .auto_node import AutoNode
 
 
diff --git a/example_auto_nodes/node_base/subgraph_node.py b/example_auto_nodes/node_base/subgraph_node.py
@@ -1,8 +1,9 @@
-from .auto_node import AutoNode
-from .utils import update_node_down_stream
-from NodeGraphQt import SubGraph
 import json
+
+from NodeGraphQt import SubGraph
 from NodeGraphQt import topological_sort_by_down, BackdropNode
+from .auto_node import AutoNode
+from .utils import update_node_down_stream
 
 
 class SubGraphNode(AutoNode, SubGraph):
diff --git a/example_auto_nodes/node_base/utils.py b/example_auto_nodes/node_base/utils.py
@@ -1,6 +1,8 @@
-from NodeGraphQt import topological_sort_by_down, NodePublishWidget
 import hashlib
 
+from NodeGraphQt import topological_sort_by_down, NodePublishWidget
+
+
 # node stream update
 
 
diff --git a/example_math_nodes.py b/example_math_nodes.py
@@ -1,11 +1,13 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-from example_nodes import Nodes
+from Qt import QtWidgets, QtCore
+
 from NodeGraphQt import (NodeGraph,
+                         PropertiesBinWidget,
+                         NodeTreeWidget,
                          update_nodes_by_down,
                          setup_context_menu)
-from NodeGraphQt import QtWidgets, QtCore, PropertiesBinWidget, NodeTreeWidget
-
+from example_nodes import Nodes
 
 if __name__ == '__main__':
     QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from .. import QtWidgets, QtCore, QtGui`
	`1`	`+from Qt import QtWidgets, QtCore, QtGui`
`2`	`2`
`3`	`3`
`4`	`4`	`class NodeTextItem(QtWidgets.QGraphicsTextItem):`