diff options
| -rw-r--r-- | qutebrowser/keyinput/keyutils.py | 7 | ||||
| -rw-r--r-- | tests/unit/keyinput/test_keyutils.py | 19 |
2 files changed, 15 insertions, 11 deletions
diff --git a/qutebrowser/keyinput/keyutils.py b/qutebrowser/keyinput/keyutils.py index 01a07d6a0..ddf818708 100644 --- a/qutebrowser/keyinput/keyutils.py +++ b/qutebrowser/keyinput/keyutils.py @@ -648,10 +648,9 @@ class KeySequence: for key in self._iter_keys(): key_seq = KeySequence(key) if key_seq in mappings: - new_seq = mappings[key_seq] - assert len(new_seq) == 1 - key = new_seq[0].to_int() - keys.append(key) + keys += [info.to_int() for info in mappings[key_seq]] + else: + keys.append(key) return self.__class__(*keys) @classmethod diff --git a/tests/unit/keyinput/test_keyutils.py b/tests/unit/keyinput/test_keyutils.py index 8ab2ab147..195518127 100644 --- a/tests/unit/keyinput/test_keyutils.py +++ b/tests/unit/keyinput/test_keyutils.py @@ -482,13 +482,18 @@ class TestKeySequence: Qt.Key_A | Qt.ControlModifier) assert seq.strip_modifiers() == expected - def test_with_mappings(self): - seq = keyutils.KeySequence.parse('foobar') - mappings = { - keyutils.KeySequence.parse('b'): keyutils.KeySequence.parse('t') - } - seq2 = seq.with_mappings(mappings) - assert seq2 == keyutils.KeySequence.parse('footar') + @pytest.mark.parametrize('inp, mappings, expected', [ + ('foobar', {'b': 't'}, 'footar'), + ('foo<Ctrl+x>bar', {'<Ctrl+x>': '<Ctrl+y>'}, 'foo<Ctrl+y>bar'), + ('foobar', {'b': 'sa'}, 'foosaar'), + ]) + def test_with_mappings(self, inp, mappings, expected): + seq = keyutils.KeySequence.parse(inp) + seq2 = seq.with_mappings({ + keyutils.KeySequence.parse(k): keyutils.KeySequence.parse(v) + for k, v in mappings.items() + }) + assert seq2 == keyutils.KeySequence.parse(expected) @pytest.mark.parametrize('keystr, expected', [ ('<Ctrl-Alt-y>', |