diff options
| author | hut <hut@lavabit.com> | 2010-02-10 18:27:41 +0100 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-03-09 14:40:19 +0100 |
| commit | 2feb26dea6e9e55cf6bc0933baefd9fad99f5507 (patch) | |
| tree | 8550f67c4e4b0676d6c79cc18c65422ed36bf82a | |
| parent | ca909b9a3b638d25092bd3990919f61fb677a502 (diff) | |
| download | ranger-2feb26dea6e9e55cf6bc0933baefd9fad99f5507.tar.gz | |
keyparser: cleanups
| -rw-r--r-- | test/tc_newkeys.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/test/tc_newkeys.py b/test/tc_newkeys.py index 1326677f..56a3303e 100644 --- a/test/tc_newkeys.py +++ b/test/tc_newkeys.py @@ -55,7 +55,7 @@ class CommandArgs(object): self.direction = keybuffer.directions and keybuffer.directions[0] or None self.directions = keybuffer.directions self.keys = str(keybuffer) - self.moo = keybuffer.moo + self.matches = keybuffer.matches class KeyBuffer(object): """The evaluator and storage for pressed keys""" @@ -133,7 +133,7 @@ class KeyBuffer(object): assert isinstance(self.tree_pointer, (binding, dict)) self.dir_tree_pointer = self.direction_keys._tree elif ANYKEY in self.tree_pointer: - self.moo.append(key) + self.matches.append(key) self.tree_pointer = self.tree_pointer[ANYKEY] assert isinstance(self.tree_pointer, (binding, dict)) self._try_to_finish() @@ -153,8 +153,7 @@ class KeyBuffer(object): self.failure = False self.done = False self.quant = None - self.moo = [] - self.quant2 = None + self.matches = [] self.command = None self.direction_quant = None self.directions = [] @@ -210,8 +209,6 @@ class Keymap(object): yield ord(char) elif isinstance(key, int): yield key - else: - raise TypeError(key) def add_binding(self, *keys, **actions): assert keys @@ -394,7 +391,7 @@ class Test(PressTestCase): def cat(arg): n = arg.n is None and 1 or arg.n - return ''.join(chr(c) for c in arg.moo) * n + return ''.join(chr(c) for c in arg.matches) * n km.add(cat, 'return.') km.add(cat, 'cat4....') |