take simpler approach to decoding keywords

thomasballinger · thomasballinger · commit 8d6ba1c836c5 · 2015-02-18T12:49:03.000-05:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -286,9 +286,9 @@ def matches(self, cursor_offset, line, **kwargs):
         n = len(text)
         for word in keyword.kwlist:
             if method_match(word, n, text):
-                word = try_decode(word, 'ascii')  # py2 keywords are all ascii
-                if word is not None:
-                    matches.add(word)
+                if not py3:
+                    word = word.decode('ascii')  # py2 keywords are all ascii
+                matches.add(word)
         for nspace in [builtins.__dict__, locals_]:
             for word, val in nspace.items():
                 if (method_match(word, len(text), text) and
