Makes the old-style class autocomplete work in 2.6 and 3.x

llllllllll · llllllllll · commit a82b4b5dba14 · 2015-03-15T19:58:42.000-04:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -33,7 +33,6 @@
 import re
 import rlcompleter
 import sys
-from types import InstanceType, ClassType
 from six.moves import range, builtins
 from six import string_types, iteritems
 
@@ -43,6 +42,9 @@
 from bpython._py3compat import py3, try_decode
 from bpython.lazyre import LazyReCompile
 
+if not py3:
+    from types import InstanceType, ClassType
+
 
 # Autocomplete modes
 SIMPLE = 'simple'
@@ -540,7 +542,7 @@ def attr_lookup(obj, expr, attr):
                 words.remove('__abstractmethods__')
             except ValueError:
                 pass
-    if isinstance(obj, (InstanceType, ClassType)):
+    if not py3 and isinstance(obj, (InstanceType, ClassType)):
         # Account for the __dict__ in an old-style class.
         words.append('__dict__')
 
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -242,7 +242,7 @@ def test_att_matches_found_on_instance(self):
     def test_att_matches_found_on_old_style_instance(self):
         self.assertSetEqual(self.com.matches(2, 'a.',
                                              locals_={'a': OldStyleFoo()}),
-                            {'a.method', 'a.a', 'a.b'})
+                            set(['a.method', 'a.a', 'a.b']))
         self.assertIn(u'a.__dict__',
                       self.com.matches(3, 'a._', locals_={'a': OldStyleFoo()}))
 
