From db74522003eed51e70d02fc0891a86d49643065f Mon Sep 17 00:00:00 2001
From: Ogi Moore <ognyan.moore@gmail.com>
Date: Sat, 9 Oct 2021 14:27:39 -0700
Subject: [PATCH 1/3] Have parameter types imports use non __init__

When using isort, the order of parametertree/__init__.py imports broke many
of the parameter-types imports.  This commit modifies the import statement to
not use the imports from __init__.py but import the respective classes from the
the non-__init__ modules
---
 pyqtgraph/parametertree/parameterTypes/action.py    | 3 ++-
 pyqtgraph/parametertree/parameterTypes/basetypes.py | 4 +++-
 pyqtgraph/parametertree/parameterTypes/calendar.py  | 2 +-
 pyqtgraph/parametertree/parameterTypes/checklist.py | 2 +-
 pyqtgraph/parametertree/parameterTypes/file.py      | 2 +-
 pyqtgraph/parametertree/parameterTypes/font.py      | 2 +-
 pyqtgraph/parametertree/parameterTypes/list.py      | 2 +-
 pyqtgraph/parametertree/parameterTypes/pen.py       | 2 +-
 pyqtgraph/parametertree/parameterTypes/progress.py  | 2 +-
 pyqtgraph/parametertree/parameterTypes/slider.py    | 2 +-
 pyqtgraph/parametertree/parameterTypes/text.py      | 2 +-
 11 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pyqtgraph/parametertree/parameterTypes/action.py b/pyqtgraph/parametertree/parameterTypes/action.py
index dcecd59d..fbf83684 100644
--- a/pyqtgraph/parametertree/parameterTypes/action.py
+++ b/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
 
 
diff --git a/pyqtgraph/parametertree/parameterTypes/basetypes.py b/pyqtgraph/parametertree/parameterTypes/basetypes.py
index ffc55a37..b9454865 100644
--- a/pyqtgraph/parametertree/parameterTypes/basetypes.py
+++ b/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
diff --git a/pyqtgraph/parametertree/parameterTypes/calendar.py b/pyqtgraph/parametertree/parameterTypes/calendar.py
index b0b8f374..67448c70 100644
--- a/pyqtgraph/parametertree/parameterTypes/calendar.py
+++ b/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
 
 
diff --git a/pyqtgraph/parametertree/parameterTypes/checklist.py b/pyqtgraph/parametertree/parameterTypes/checklist.py
index 88a436f3..90b8d6a2 100644
--- a/pyqtgraph/parametertree/parameterTypes/checklist.py
+++ b/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
 
diff --git a/pyqtgraph/parametertree/parameterTypes/file.py b/pyqtgraph/parametertree/parameterTypes/file.py
index 951589d9..bb76a49a 100644
--- a/pyqtgraph/parametertree/parameterTypes/file.py
+++ b/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
 
 
diff --git a/pyqtgraph/parametertree/parameterTypes/font.py b/pyqtgraph/parametertree/parameterTypes/font.py
index 01756cdf..094f213b 100644
--- a/pyqtgraph/parametertree/parameterTypes/font.py
+++ b/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
 
 
diff --git a/pyqtgraph/parametertree/parameterTypes/list.py b/pyqtgraph/parametertree/parameterTypes/list.py
index 0de5c3db..8ac4f4da 100644
--- a/pyqtgraph/parametertree/parameterTypes/list.py
+++ b/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
 
diff --git a/pyqtgraph/parametertree/parameterTypes/pen.py b/pyqtgraph/parametertree/parameterTypes/pen.py
index 4c56d1cd..cad241b6 100644
--- a/pyqtgraph/parametertree/parameterTypes/pen.py
+++ b/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
diff --git a/pyqtgraph/parametertree/parameterTypes/progress.py b/pyqtgraph/parametertree/parameterTypes/progress.py
index aae86ad9..d9bfd918 100644
--- a/pyqtgraph/parametertree/parameterTypes/progress.py
+++ b/pyqtgraph/parametertree/parameterTypes/progress.py
@@ -1,5 +1,5 @@
 from ...Qt import QtWidgets
-from .. import Parameter
+from ..Parameter import Parameter
 from .basetypes import WidgetParameterItem
 
 
diff --git a/pyqtgraph/parametertree/parameterTypes/slider.py b/pyqtgraph/parametertree/parameterTypes/slider.py
index ac85edb3..502496f8 100644
--- a/pyqtgraph/parametertree/parameterTypes/slider.py
+++ b/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):
diff --git a/pyqtgraph/parametertree/parameterTypes/text.py b/pyqtgraph/parametertree/parameterTypes/text.py
index 6fec5b54..3d684c18 100644
--- a/pyqtgraph/parametertree/parameterTypes/text.py
+++ b/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
 
 

From 9b67e512308e74aa8539b1e4129c37fddc4802ed Mon Sep 17 00:00:00 2001
From: Ogi Moore <ognyan.moore@gmail.com>
Date: Sat, 9 Oct 2021 14:37:00 -0700
Subject: [PATCH 2/3] Switch to relative imports for some parameterTypes

---
 pyqtgraph/parametertree/parameterTypes/bool.py | 4 ++--
 pyqtgraph/parametertree/parameterTypes/str.py  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyqtgraph/parametertree/parameterTypes/bool.py b/pyqtgraph/parametertree/parameterTypes/bool.py
index 26344653..edb011ab 100644
--- a/pyqtgraph/parametertree/parameterTypes/bool.py
+++ b/pyqtgraph/parametertree/parameterTypes/bool.py
@@ -1,5 +1,5 @@
-from pyqtgraph.Qt import QtWidgets
-from pyqtgraph.parametertree.parameterTypes import WidgetParameterItem
+from ...Qt import QtWidgets
+from .basetypes import WidgetParameterItem
 
 
 class BoolParameterItem(WidgetParameterItem):
diff --git a/pyqtgraph/parametertree/parameterTypes/str.py b/pyqtgraph/parametertree/parameterTypes/str.py
index 8ee87a1a..ddf65969 100644
--- a/pyqtgraph/parametertree/parameterTypes/str.py
+++ b/pyqtgraph/parametertree/parameterTypes/str.py
@@ -1,5 +1,5 @@
-from pyqtgraph.Qt import QtWidgets
-from pyqtgraph.parametertree.parameterTypes import WidgetParameterItem
+from ...Qt import QtWidgets
+from .basetypes import WidgetParameterItem
 
 
 class StrParameterItem(WidgetParameterItem):

From 936108ec60c8e21e3ea9d20b698db3da3f6a631a Mon Sep 17 00:00:00 2001
From: Ogi Moore <ognyan.moore@gmail.com>
Date: Sat, 9 Oct 2021 14:42:10 -0700
Subject: [PATCH 3/3] Import Dock class not module

---
 pyqtgraph/dockarea/Container.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyqtgraph/dockarea/Container.py b/pyqtgraph/dockarea/Container.py
index 61b15b5b..78a0e29c 100644
--- a/pyqtgraph/dockarea/Container.py
+++ b/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