From 81ba49e79b30a4bb9060688e48e394889f5837a6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 17 May 2015 18:59:40 +0200
Subject: [PATCH] Fix tests on OS X, take two.

---
 qutebrowser/utils/utils.py | 21 +++++++++++++--------
 tests/utils/test_utils.py  |  6 ++++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index b7d64a07f..298aba2b0 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -326,19 +326,24 @@ def keyevent_to_string(e):
         A name of the key (combination) as a string or
         None if only modifiers are pressed..
     """
-    modmask2str = collections.OrderedDict([
-        (Qt.ControlModifier, 'Ctrl'),
-        (Qt.AltModifier, 'Alt'),
-        (Qt.MetaModifier, 'Meta'),
-        (Qt.ShiftModifier, 'Shift'),
-    ])
     if sys.platform == 'darwin':
         # Qt swaps Ctrl/Meta on OS X, so we switch it back here so the user can
         # use it in the config as expected. See:
         # https://github.com/The-Compiler/qutebrowser/issues/110
         # http://doc.qt.io/qt-5.4/osx-issues.html#special-keys
-        modmask2str[Qt.MetaModifier] = 'Ctrl'
-        modmask2str[Qt.ControlModifier] = 'Meta'
+        modmask2str = collections.OrderedDict([
+            (Qt.MetaModifier, 'Ctrl'),
+            (Qt.AltModifier, 'Alt'),
+            (Qt.ControlModifier, 'Meta'),
+            (Qt.ShiftModifier, 'Shift'),
+        ])
+    else:
+        modmask2str = collections.OrderedDict([
+            (Qt.ControlModifier, 'Ctrl'),
+            (Qt.AltModifier, 'Alt'),
+            (Qt.MetaModifier, 'Meta'),
+            (Qt.ShiftModifier, 'Shift'),
+        ])
     modifiers = (Qt.Key_Control, Qt.Key_Alt, Qt.Key_Shift, Qt.Key_Meta,
                  Qt.Key_AltGr, Qt.Key_Super_L, Qt.Key_Super_R,
                  Qt.Key_Hyper_L, Qt.Key_Hyper_R, Qt.Key_Direction_L,
diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py
index 09b8e0d8f..588753587 100644
--- a/tests/utils/test_utils.py
+++ b/tests/utils/test_utils.py
@@ -19,6 +19,7 @@
 
 """Tests for qutebrowser.utils.utils."""
 
+import sys
 import enum
 import datetime
 import os.path
@@ -312,10 +313,11 @@ class TestKeyEventToString:
     def test_key_and_modifier(self, fake_keyevent_factory):
         """Test with key and modifier pressed."""
         evt = fake_keyevent_factory(key=Qt.Key_A, modifiers=Qt.ControlModifier)
-        assert utils.keyevent_to_string(evt) == 'Ctrl+A'
+        expected = 'Meta+A' if sys.platform == 'darwin' else 'Ctrl+A'
+        assert utils.keyevent_to_string(evt) == expected
 
     def test_key_and_modifiers(self, fake_keyevent_factory):
-        """Test with key and multiple modifier pressed."""
+        """Test with key and multiple modifiers pressed."""
         evt = fake_keyevent_factory(
             key=Qt.Key_A, modifiers=(Qt.ControlModifier | Qt.AltModifier |
                                      Qt.MetaModifier | Qt.ShiftModifier))