test: more qt6 conditions

src/app_model/backends/qt/_qkeymap.py

@@ -9,9 +9,10 @@
 from ...types._keys import KeyBinding, KeyCode, KeyCombo, KeyMod, SimpleKeyBinding
 
 try:
-    from qtpy import QT6
+    from qtpy import PYQT6, QT6
 except ImportError:
     QT6 = False
+    PYQT6 = False
 
 
 QMETA = Qt.KeyboardModifier.MetaModifier
@@ -36,12 +37,6 @@ def simple_keybinding_to_qint(skb: SimpleKeyBinding) -> int:
         combo = QKeyCombination(reduce(operator.or_, mods), key)
         return cast(int, combo.toCombined())
 
-    def _get_qmods(key: QKeyCombination) -> Qt.KeyboardModifier:
-        return key.keyboardModifiers()
-
-    def _get_qkey(key: QKeyCombination) -> Qt.Key:
-        return key.key()
-
 else:
     QKeyCombination = int
 
@@ -52,6 +47,17 @@ def simple_keybinding_to_qint(skb: SimpleKeyBinding) -> int:
         out = reduce(operator.or_, mods, out)
         return int(out)
 
+
+if PYQT6:
+
+    def _get_qmods(key: QKeyCombination) -> Qt.KeyboardModifier:
+        return key.keyboardModifiers()
+
+    def _get_qkey(key: QKeyCombination) -> Qt.Key:
+        return key.key()
+
+else:
+
     def _get_qmods(key: QKeyCombination) -> Qt.KeyboardModifier:
         return Qt.KeyboardModifier(key & Qt.KeyboardModifier.KeyboardModifierMask)
 

tests/test_qt/test_qkeymap.py

@@ -12,7 +12,7 @@ def test_qkey_lookup() -> None:
         key = getattr(Qt.Key, keyname)
         assert isinstance(qkey2modelkey(key), (KeyCode, KeyCombo))
 
-    assert qkey2modelkey(Qt.Key_M) == KeyCode.KeyM
+    assert qkey2modelkey(Qt.Key.Key_M) == KeyCode.KeyM
 
 
 def test_qkeysequence2modelkeybinding() -> None: