Decode before comparing

sebastinas · sebastinas · commit a8787b350a9f · 2015-05-17T13:14:08.000+02:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -402,11 +402,11 @@ def matches(self, cursor_offset, line, **kwargs):
                 matches.add(word)
         for nspace in (builtins.__dict__, locals_):
             for word, val in iteritems(nspace):
+                word = try_decode(word, 'ascii')
+                # if identifier isn't ascii, don't complete (syntax error)
+                if word is None:
+                    continue
                 if self.method_match(word, n, text) and word != "__builtins__":
-                    word = try_decode(word, 'ascii')
-                    # if identifier isn't ascii, don't complete (syntax error)
-                    if word is None:
-                        continue
                     matches.add(_callable_postfix(val, word))
         return matches
 
