Fixed some Qt6 compatibility issues

Author: PierreRaybaut

plotpy/events.py

@@ -121,7 +121,7 @@ class StandardKeyMatch(EventMatch):
 
     def __init__(self, keysequence):
         super().__init__()
-        assert isinstance(keysequence, int)
+        assert isinstance(keysequence, (int, QG.QKeySequence.StandardKey))
         self.keyseq = keysequence
 
     def get_event_types(self):
@@ -140,7 +140,7 @@ class MouseEventMatch(EventMatch):
 
     def __init__(self, evt_type, btn, modifiers=QC.Qt.NoModifier):
         super().__init__()
-        assert isinstance(modifiers, (int, QC.Qt.KeyboardModifiers))
+        assert isinstance(modifiers, (int, QC.Qt.KeyboardModifier))
         self.evt_type = evt_type
         self.button = btn
         self.modifiers = modifiers

plotpy/plot/base.py

@@ -409,7 +409,7 @@ def __del__(self):
                 # Depending on which widget owns the plot,
                 # Qt may have already deleted the canvas when
                 # the plot is deleted.
-                if "wrapped C/C++ object of type" not in str(exc):
+                if "C++ object" not in str(exc):
                     raise
             except ValueError as exc:
                 # This happens when object has already been deleted

plotpy/tests/gui/test_transform.py

@@ -61,14 +61,9 @@ def get_font_array(sz: int, chars: str = DEFAULT_CHARS) -> np.ndarray | None:
     paint.drawText(0, paint.fontMetrics().ascent(), chars)
     paint.end()
     try:
-        try:
-            data = img.bits().asstring(img.numBytes())
-        except AttributeError:
-            # PyQt5
-            data = img.bits().asstring(img.byteCount())
-    except SystemError:
-        # Python 3
-        return
+        data = img.bits().asstring(img.sizeInBytes())
+    except AttributeError:
+        data = img.bits()
     npy = np.frombuffer(data, np.uint8)
     npy.shape = img.height(), img.bytesPerLine() // 4, 4
     return npy[:, :, 0]

plotpy/tools/selection.py

@@ -97,12 +97,12 @@ def setup_filter(self, baseplot):
                     (
                         QC.Qt.Key.Key_Left,
                         QC.Qt.KeyboardModifier.ControlModifier
-                        + QC.Qt.KeyboardModifier.ShiftModifier,
+                        | QC.Qt.KeyboardModifier.ShiftModifier,
                     ),
                     (
                         QC.Qt.Key.Key_Right,
                         QC.Qt.KeyboardModifier.ControlModifier
-                        + QC.Qt.KeyboardModifier.ShiftModifier,
+                        | QC.Qt.KeyboardModifier.ShiftModifier,
                     ),
                 ]
             ),