rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Really fix keyevent_to_string.

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-26 07:31:59 +02:00
parent 27117246b7
commit 1960cfe114
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/test/utils/test_utils.py
View File

@ -506,10 +506,10 @@ class KeyEventToStringTests(unittest.TestCase):
Qt.MetaModifier | Qt.ShiftModifier)) Qt.MetaModifier | Qt.ShiftModifier))
if sys.platform == 'darwin': if sys.platform == 'darwin':
self.assertEqual(utils.keyevent_to_string(evt), self.assertEqual(utils.keyevent_to_string(evt),
'Ctrl+Alt+Shift+A') 'Ctrl+Alt+Shift+A')
else: else:
self.assertEqual(utils.keyevent_to_string(evt), self.assertEqual(utils.keyevent_to_string(evt),
'Ctrl+Alt+Meta+Shift+A') 'Ctrl+Alt+Meta+Shift+A')
class NormalizeTests(unittest.TestCase): class NormalizeTests(unittest.TestCase):

2
qutebrowser/utils/utils.py
View File

@ -442,7 +442,7 @@ def keyevent_to_string(e):
mod = e.modifiers() mod = e.modifiers()
parts = [] parts = []
for (mask, s) in modmask2str.items(): for (mask, s) in modmask2str.items():
if mod & mask: if mod & mask and s not in parts:
parts.append(s) parts.append(s)
parts.append(key_to_string(e.key())) parts.append(key_to_string(e.key()))
return '+'.join(parts) return '+'.join(parts)