Merge pull request #26384 from QuLogic/fix-triage-tool

ksunden · web-flow · commit 97544ddaa40d · 2023-07-25T12:32:12.000-05:00
diff --git a/tools/triage_tests.py b/tools/triage_tests.py
@@ -30,7 +30,7 @@
 import sys
 
 from matplotlib.backends.qt_compat import QtCore, QtGui, QtWidgets
-from matplotlib.backends.qt_compat import _enum, _exec
+from matplotlib.backends.qt_compat import _exec
 
 
 # matplotlib stores the baseline images under two separate subtrees,
@@ -62,13 +62,13 @@ def __init__(self, parent, index, name):
         layout = QtWidgets.QVBoxLayout()
 
         label = QtWidgets.QLabel(name)
-        label.setAlignment(_enum('QtCore.Qt.AlignmentFlag').AlignHCenter |
-                           _enum('QtCore.Qt.AlignmentFlag').AlignVCenter)
+        label.setAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter |
+                           QtCore.Qt.AlignmentFlag.AlignVCenter)
         layout.addWidget(label, 0)
 
         self.image = QtWidgets.QLabel()
-        self.image.setAlignment(_enum('QtCore.Qt.AlignmentFlag').AlignHCenter |
-                                _enum('QtCore.Qt.AlignmentFlag').AlignVCenter)
+        self.image.setAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter |
+                                QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.image.setMinimumSize(800 // 3, 600 // 3)
         layout.addWidget(self.image)
         self.setLayout(layout)
@@ -86,7 +86,7 @@ def __init__(self, window):
         self.window = window
 
     def eventFilter(self, receiver, event):
-        if event.type() == _enum('QtCore.QEvent.Type').KeyPress:
+        if event.type() == QtCore.QEvent.Type.KeyPress:
             self.window.keyPressEvent(event)
             return True
         else:
@@ -127,8 +127,8 @@ def __init__(self, entries):
         images_box = QtWidgets.QWidget()
         self.image_display = QtWidgets.QLabel()
         self.image_display.setAlignment(
-            _enum('QtCore.Qt.AlignmentFlag').AlignHCenter |
-            _enum('QtCore.Qt.AlignmentFlag').AlignVCenter)
+            QtCore.Qt.AlignmentFlag.AlignHCenter |
+            QtCore.Qt.AlignmentFlag.AlignVCenter)
         self.image_display.setMinimumSize(800, 600)
         images_layout.addWidget(self.image_display, 6)
         images_box.setLayout(images_layout)
@@ -167,8 +167,8 @@ def set_entry(self, index):
             pixmap = QtGui.QPixmap(os.fspath(fname))
             scaled_pixmap = pixmap.scaled(
                 thumbnail.size(),
-                _enum('QtCore.Qt.AspectRatioMode').KeepAspectRatio,
-                _enum('QtCore.Qt.TransformationMode').SmoothTransformation)
+                QtCore.Qt.AspectRatioMode.KeepAspectRatio,
+                QtCore.Qt.TransformationMode.SmoothTransformation)
             thumbnail.image.setPixmap(scaled_pixmap)
             self.pixmaps.append(scaled_pixmap)
 
@@ -177,14 +177,14 @@ def set_entry(self, index):
 
     def set_large_image(self, index):
         self.thumbnails[self.current_thumbnail].setFrameShape(
-            _enum('QtWidgets.QFrame.Shape').NoFrame)
+            QtWidgets.QFrame.Shape.NoFrame)
         self.current_thumbnail = index
         pixmap = QtGui.QPixmap(os.fspath(
             self.entries[self.current_entry]
             .thumbnails[self.current_thumbnail]))
         self.image_display.setPixmap(pixmap)
         self.thumbnails[self.current_thumbnail].setFrameShape(
-            _enum('QtWidgets.QFrame.Shape').Box)
+            QtWidgets.QFrame.Shape.Box)
 
     def accept_test(self):
         entry = self.entries[self.current_entry]
@@ -209,17 +209,17 @@ def reject_test(self):
         self.set_entry(min((self.current_entry + 1), len(self.entries) - 1))
 
     def keyPressEvent(self, e):
-        if e.key() == _enum('QtCore.Qt.Key').Key_Left:
+        if e.key() == QtCore.Qt.Key.Key_Left:
             self.set_large_image((self.current_thumbnail - 1) % 3)
-        elif e.key() == _enum('QtCore.Qt.Key').Key_Right:
+        elif e.key() == QtCore.Qt.Key.Key_Right:
             self.set_large_image((self.current_thumbnail + 1) % 3)
-        elif e.key() == _enum('QtCore.Qt.Key').Key_Up:
+        elif e.key() == QtCore.Qt.Key.Key_Up:
             self.set_entry(max(self.current_entry - 1, 0))
-        elif e.key() == _enum('QtCore.Qt.Key').Key_Down:
+        elif e.key() == QtCore.Qt.Key.Key_Down:
             self.set_entry(min(self.current_entry + 1, len(self.entries) - 1))
-        elif e.key() == _enum('QtCore.Qt.Key').Key_A:
+        elif e.key() == QtCore.Qt.Key.Key_A:
             self.accept_test()
-        elif e.key() == _enum('QtCore.Qt.Key').Key_R:
+        elif e.key() == QtCore.Qt.Key.Key_R:
             self.reject_test()
         else:
             super().keyPressEvent(e)
