Fix Python 3 compatibility issues

sebastinas · sebastinas · commit 2b479b4252b4 · 2015-02-06T14:05:30.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -27,6 +27,7 @@
 import os
 import rlcompleter
 from six.moves import range, builtins
+from six import string_types
 
 from glob import glob
 
@@ -312,7 +313,7 @@ def matches(self, cursor_offset, line, **kwargs):
         start, end, word = r
         if argspec:
             matches = set(name + '=' for name in argspec[1][0]
-                          if isinstance(name, basestring) and
+                          if isinstance(name, string_types) and
                           name.startswith(word))
             if py3:
                 matches.update(name + '=' for name in argspec[1][4]
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -43,7 +43,7 @@
 from types import ModuleType
 from optparse import Option
 from six.moves import range
-from six import iteritems
+from six import iteritems, string_types
 
 from pygments.token import Token
 
@@ -285,7 +285,7 @@ def decoding_input_filter(keys, raw):
     encoding = locale.getpreferredencoding()
     converted_keys = list()
     for key in keys:
-        if isinstance(key, basestring):
+        if isinstance(key, string_types):
             converted_keys.append(key.decode(encoding))
         else:
             converted_keys.append(key)
