Merge pull request #2014 from j9ac9k/fix-some-imports

Fix Some Import Issues

pyqtgraph/dockarea/Container.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from ..Qt import QtCore, QtGui, QtWidgets
 import weakref
+from .Dock import Dock
+
 
 class Container(object):
     #sigStretchChanged = QtCore.Signal()  ## can't do this here; not a QObject.
@@ -245,7 +247,7 @@ class TContainer(Container, QtGui.QWidget):
 
 
     def _insertItem(self, item, index):
-        if not isinstance(item, Dock.Dock):
+        if not isinstance(item, Dock):
             raise Exception("Tab containers may hold only docks, not other containers.")
         self.stack.insertWidget(index, item)
         self.hTabLayout.insertWidget(index, item.label)
@@ -288,5 +290,3 @@ class TContainer(Container, QtGui.QWidget):
             x = max(x, wx)
             y = max(y, wy)
         self.setStretch(x, y)
-        
-from . import Dock

pyqtgraph/parametertree/parameterTypes/action.py

@@ -1,4 +1,5 @@
-from .. import ParameterItem, Parameter
+from ..ParameterItem import ParameterItem
+from ..Parameter import Parameter
 from ...Qt import QtWidgets, QtCore
 
 

pyqtgraph/parametertree/parameterTypes/basetypes.py

@@ -1,6 +1,8 @@
 import builtins
 
-from .. import ParameterItem, Parameter
+from ..ParameterItem import ParameterItem
+from ..Parameter import Parameter
+
 from ... import functions as fn
 from ...Qt import QtWidgets, QtCore, QtGui
 from ... import icons

pyqtgraph/parametertree/parameterTypes/bool.py

@@ -1,5 +1,5 @@
-from pyqtgraph.Qt import QtWidgets
+from ...Qt import QtWidgets
-from pyqtgraph.parametertree.parameterTypes import WidgetParameterItem
+from .basetypes import WidgetParameterItem
 
 
 class BoolParameterItem(WidgetParameterItem):

pyqtgraph/parametertree/parameterTypes/calendar.py

@@ -1,5 +1,5 @@
 from ...Qt import QtWidgets, QtCore
-from .. import Parameter
+from ..Parameter import Parameter
 from .basetypes import WidgetParameterItem
 
 

pyqtgraph/parametertree/parameterTypes/checklist.py

@@ -2,7 +2,7 @@ from . import BoolParameterItem, SimpleParameter
 from .basetypes import GroupParameterItem, GroupParameter, WidgetParameterItem
 from .list import ListParameter
 from .slider import Emitter
-from .. import ParameterItem
+from ..ParameterItem import ParameterItem
 from ... import functions as fn
 from ...Qt import QtWidgets
 

pyqtgraph/parametertree/parameterTypes/file.py

@@ -2,7 +2,7 @@ import os
 import re
 
 from .str import StrParameterItem
-from .. import Parameter
+from ..Parameter import Parameter
 from ...Qt import QtWidgets, QtGui, QtCore
 
 

pyqtgraph/parametertree/parameterTypes/font.py

@@ -1,5 +1,5 @@
 from .basetypes import WidgetParameterItem
-from .. import Parameter
+from ..Parameter import Parameter
 from ...Qt import QtWidgets, QtGui
 
 

pyqtgraph/parametertree/parameterTypes/list.py

@@ -2,7 +2,7 @@ import warnings
 from collections import OrderedDict
 
 from .basetypes import WidgetParameterItem
-from .. import Parameter
+from ..Parameter import Parameter
 from ...Qt import QtWidgets
 from ... import functions as fn
 

pyqtgraph/parametertree/parameterTypes/pen.py

@@ -1,5 +1,5 @@
 from .basetypes import WidgetParameterItem
-from .. import Parameter
+from ..Parameter import Parameter
 from ... import functions as fn
 from ...Qt import QtWidgets, QtGui, QtCore
 from ...widgets.PenSelectorDialog import PenSelectorDialog

pyqtgraph/parametertree/parameterTypes/progress.py

@@ -1,5 +1,5 @@
 from ...Qt import QtWidgets
-from .. import Parameter
+from ..Parameter import Parameter
 from .basetypes import WidgetParameterItem
 
 

pyqtgraph/parametertree/parameterTypes/slider.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 from .basetypes import WidgetParameterItem, Emitter
-from .. import Parameter
+from ..Parameter import Parameter
 from ...Qt import QtCore, QtWidgets
 
 class SliderParameterItem(WidgetParameterItem):

pyqtgraph/parametertree/parameterTypes/str.py

@@ -1,5 +1,5 @@
-from pyqtgraph.Qt import QtWidgets
+from ...Qt import QtWidgets
-from pyqtgraph.parametertree.parameterTypes import WidgetParameterItem
+from .basetypes import WidgetParameterItem
 
 
 class StrParameterItem(WidgetParameterItem):

pyqtgraph/parametertree/parameterTypes/text.py

@@ -1,5 +1,5 @@
 from .basetypes import WidgetParameterItem
-from .. import Parameter
+from ..Parameter import Parameter
 from ...Qt import QtWidgets, QtCore