From 1960cfe114247796f39e8fbeb8c931be4cd2cd86 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 26 Sep 2014 07:31:59 +0200 Subject: [PATCH] Really fix keyevent_to_string. --- qutebrowser/test/utils/test_utils.py | 4 ++-- qutebrowser/utils/utils.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qutebrowser/test/utils/test_utils.py b/qutebrowser/test/utils/test_utils.py index c6fa9d3de..7c4a4d905 100644 --- a/qutebrowser/test/utils/test_utils.py +++ b/qutebrowser/test/utils/test_utils.py @@ -506,10 +506,10 @@ class KeyEventToStringTests(unittest.TestCase): Qt.MetaModifier | Qt.ShiftModifier)) if sys.platform == 'darwin': self.assertEqual(utils.keyevent_to_string(evt), - 'Ctrl+Alt+Shift+A') + 'Ctrl+Alt+Shift+A') else: self.assertEqual(utils.keyevent_to_string(evt), - 'Ctrl+Alt+Meta+Shift+A') + 'Ctrl+Alt+Meta+Shift+A') class NormalizeTests(unittest.TestCase): diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index f581f3569..4a64e5341 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -442,7 +442,7 @@ def keyevent_to_string(e): mod = e.modifiers() parts = [] for (mask, s) in modmask2str.items(): - if mod & mask: + if mod & mask and s not in parts: parts.append(s) parts.append(key_to_string(e.key())) return '+'.join(parts)