pythonthings
diff --git a/‎bpython/autocomplete.py‎
Lines changed: 18 additions & 1 deletion b/‎bpython/autocomplete.py‎
Lines changed: 18 additions & 1 deletion
diff --git a/‎bpython/test/test_autocomplete.py‎
Lines changed: 2 additions & 2 deletions b/‎bpython/test/test_autocomplete.py‎
Lines changed: 2 additions & 2 deletions
@@ -296,7 +296,7 @@ def attr_lookup(self, obj, expr, attr):
         """Second half of original attr_matches method factored out so it can
         be wrapped in a safe try/finally block in case anything bad happens to
         restore the original __getattribute__ method."""
-        words = dir(obj)
+        words = self.list_attributes(obj)
         if hasattr(obj, '__class__'):
             words.append('__class__')
             words = words + rlcompleter.get_class_members(obj.__class__)
@@ -317,6 +317,23 @@ def attr_lookup(self, obj, expr, attr):
                 matches.append("%s.%s" % (expr, word))
         return matches
 
+    if py3:
+        def list_attributes(self, obj):
+            return dir(obj)
+    else:
+        def list_attributes(self, obj):
+            if isinstance(obj, InstanceType):
+                try:
+                    return dir(obj)
+                except Exception:
+                    # This is a case where we can not prevent user code from
+                    # running. We return a default list attributes on error
+                    # instead. (#536)
+                    return ['__doc__', '__module__']
+            else:
+                return dir(obj)
+
+
 
 class DictKeyCompletion(BaseCompletionType):
 
 
@@ -252,14 +252,14 @@ def test_att_matches_found_on_old_style_class_object(self):
                       self.com.matches(3, 'A._', locals_={'A': OldStyleFoo}))
 
     @skip_old_style
-    @unittest.expectedFailure
     def test_issue536(self):
         class OldStyleWithBrokenGetAttr:
             def __getattr__(self, attr):
                 raise Exception()
 
         locals_ = {'a': OldStyleWithBrokenGetAttr()}
-        self.com.matches(2, 'a.', locals_=locals_)
+        self.assertIn(u'a.__module__',
+                      self.com.matches(3, 'a._', locals_=locals_))
 
 
 class TestMagicMethodCompletion(unittest.TestCase):