TST: simplify how we do the OSX (re-re)-patching

tacaswell · tacaswell · commit f6ef5922e782 · 2021-09-20T16:52:13.000-07:00
diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py
@@ -170,35 +170,19 @@ def custom_handler(signum, frame):
     [
         ("Key_A", ["ShiftModifier"], "A"),
         ("Key_A", [], "a"),
-        (
-            "Key_A",
-            ["ControlModifier"],
-            ("ctrl+a" if sys.platform != "darwin" else "cmd+a"),
-        ),
+        ("Key_A", ["ControlModifier"], ("ctrl+a")),
         (
             "Key_Aacute",
             ["ShiftModifier"],
-            "\N{LATIN CAPITAL LETTER A WITH ACUTE}"
+            "\N{LATIN CAPITAL LETTER A WITH ACUTE}",
         ),
         ("Key_Aacute", [], "\N{LATIN SMALL LETTER A WITH ACUTE}"),
-        (
-            "Key_Control",
-            ["AltModifier"],
-            ("alt+control" if sys.platform != "darwin" else "alt+cmd"),
-        ),
-        (
-            "Key_Alt",
-            ["ControlModifier"],
-            "ctrl+alt" if sys.platform != "darwin" else "cmd+alt",
-        ),
+        ("Key_Control", ["AltModifier"], ("alt+ctrl")),
+        ("Key_Alt", ["ControlModifier"], "ctrl+alt"),
         (
             "Key_Aacute",
             ["ControlModifier", "AltModifier", "MetaModifier"],
-            (
-                "ctrl+alt+meta+\N{LATIN SMALL LETTER A WITH ACUTE}"
-                if sys.platform != "darwin"
-                else "cmd+alt+ctrl+\N{LATIN SMALL LETTER A WITH ACUTE}"
-            ),
+            ("ctrl+alt+meta+\N{LATIN SMALL LETTER A WITH ACUTE}"),
         ),
         # We do not currently map the media keys, this may change in the
         # future.  This means the callback will never fire
@@ -207,7 +191,7 @@ def custom_handler(signum, frame):
         (
             "Key_Backspace",
             ["ControlModifier"],
-            "ctrl+backspace" if sys.platform != "darwin" else "cmd+backspace",
+            "ctrl+backspace",
         ),
     ],
     ids=[
@@ -241,6 +225,10 @@ def test_correct_key(backend, qt_core, qt_key, qt_mods, answer):
     Assert sent and caught keys are the same.
     """
     from matplotlib.backends.qt_compat import _enum, _to_int
+
+    if sys.platform == "darwin" and answer is not None:
+        answer = answer.replace("ctrl", "cmd")
+        answer = answer.replace("meta", "ctrl")
     result = None
     qt_mod = _enum("QtCore.Qt.KeyboardModifier").NoModifier
     for mod in qt_mods:
