change PyQt import order

TUDelft-CNS-ATM · May 31, 2024 · 333d4a3 · 333d4a3
1 parent 00a72e0
commit 333d4a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/bluesky/ui/qtgl/splitter.py b/bluesky/ui/qtgl/splitter.py
@@ -1,9 +1,12 @@
 try:
-    from PyQt5.QtWidgets import QSplitter, QSplitterHandle, QVBoxLayout, QToolButton
-except ImportError:
     from PyQt6.QtCore import Qt
     from PyQt6.QtWidgets import QSplitter, QSplitterHandle, QVBoxLayout, QToolButton
 
+except ImportError:
+    from PyQt5.QtCore import Qt
+    from PyQt5.QtWidgets import QSplitter, QSplitterHandle, QVBoxLayout, QToolButton
+
+
 
 class Handle(QSplitterHandle):
     ''' Custom splitter handle with collapse button. '''

diff --git a/bluesky/ui/qtgl/stacklist.py b/bluesky/ui/qtgl/stacklist.py
@@ -1,12 +1,10 @@
 try:
-    from PyQt5.QtWidgets import QListView, QStyledItemDelegate, QStyle, QApplication as app
-    from PyQt5.QtGui import QColor, QPalette
-    from PyQt5.QtCore import QSize, Qt, QRect, QAbstractListModel, QModelIndex, Qt, QVariant
-except ImportError:
-    from PyQt6.QtWidgets import QListView, QStyledItemDelegate, QStyle, QApplication as app
-    from PyQt6.QtGui import QColor, QPalette
-    from PyQt6.QtCore import QSize, Qt, QRect, QAbstractListModel, QModelIndex, Qt, QVariant
+    from PyQt6.QtWidgets import QListView
+    from PyQt6.QtGui import QPalette
 
+except ImportError:
+    from PyQt5.QtWidgets import QListView
+    from PyQt5.QtGui import QPalette
 
 
 class StackList(QListView):

diff --git a/bluesky/ui/qtgl/trafficlist.py b/bluesky/ui/qtgl/trafficlist.py
@@ -1,7 +1,6 @@
-from functools import partial
 import numpy as np
 
-from PyQt6.QtWidgets import QListView, QStyledItemDelegate, QStyle, QApplication as app
+from PyQt6.QtWidgets import QListView, QStyledItemDelegate, QApplication as app
 from PyQt6.QtGui import QColor, QPalette
 from PyQt6.QtCore import QSize, Qt, QRect, QAbstractListModel, QModelIndex, Qt, QVariant, QTimer