summaryrefslogtreecommitdiff
path: root/urwid/escape.py
diff options
context:
space:
mode:
authorEevee (Alex Munroe) <eevee.git@veekun.com>2014-05-11 19:54:35 -0700
committerEevee (Alex Munroe) <eevee.git@veekun.com>2014-05-11 21:30:23 -0700
commitbe714a183206490aafec0e244b166ba3de803142 (patch)
tree1986bc42504e299e1cb472ffe608a7e34c83de99 /urwid/escape.py
parentef05b48a1cd4d0071873022d1a31d2a076911eb0 (diff)
downloadurwid-be714a183206490aafec0e244b166ba3de803142.tar.gz
Fix some Python 3 things that work fine in 2.6 anyway.
Diffstat (limited to 'urwid/escape.py')
-rw-r--r--urwid/escape.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/urwid/escape.py b/urwid/escape.py
index 077e38e..12501b8 100644
--- a/urwid/escape.py
+++ b/urwid/escape.py
@@ -102,7 +102,7 @@ input_sequences = [
] + [
# modified cursor keys + home, end, 5 -- [#X and [1;#X forms
(prefix+digit+letter, escape_modifier(digit) + key)
- for prefix in "[","[1;"
+ for prefix in ("[", "[1;")
for digit in "12345678"
for letter,key in zip("ABCDEFGH",
('up','down','right','left','5','end','5','home'))
@@ -138,7 +138,7 @@ class KeyqueueTrie(object):
assert type(root) == dict, "trie conflict detected"
assert len(s) > 0, "trie conflict detected"
- if root.has_key(ord(s[0])):
+ if ord(s[0]) in root:
return self.add(root[ord(s[0])], s[1:], result)
if len(s)>1:
d = {}
@@ -163,7 +163,7 @@ class KeyqueueTrie(object):
if more_available:
raise MoreInputRequired()
return None
- if not root.has_key(keys[0]):
+ if keys[0] not in root:
return None
return self.get_recurse(root[keys[0]], keys[1:], more_available)
@@ -318,7 +318,7 @@ def process_keyqueue(codes, more_available):
if code >= 32 and code <= 126:
key = chr(code)
return [key], codes[1:]
- if _keyconv.has_key(code):
+ if code in _keyconv:
return [_keyconv[code]], codes[1:]
if code >0 and code <27:
return ["ctrl %s" % chr(ord('a')+code-1)], codes[1:]