Fix inspection.is_callable().

Trundle · Trundle · commit c919c9661fae · 2010-03-30T22:54:38.000+02:00
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -35,14 +35,14 @@
 try:
     collections.Callable
     has_collections_callable = True
-    try:
-        import types
-        types.InstanceType
-        has_instance_type = True
-    except AttributeError:
-        has_instance_type = False
 except AttributeError:
     has_collections_callable = False
+try:
+    import types
+    types.InstanceType
+    has_instance_type = True
+except AttributeError:
+    has_instance_type = False
 
 py3 = sys.version_info[0] == 3
 
diff --git a/bpython/test/test_inspection.py b/bpython/test/test_inspection.py
@@ -0,0 +1,31 @@
+import unittest
+
+from bpython import inspection
+
+class TestInspection(unittest.TestCase):
+    def test_is_callable(self):
+        class OldCallable:
+            def __call__(self):
+                pass
+
+        class Callable(object):
+            def __call__(self):
+                pass
+
+        class OldNoncallable:
+            pass
+
+        class Noncallable(object):
+            pass
+
+        def spam():
+            pass
+
+        self.assertTrue(inspection.is_callable(spam))
+        self.assertTrue(inspection.is_callable(Callable))
+        self.assertTrue(inspection.is_callable(Callable()))
+        self.assertTrue(inspection.is_callable(OldCallable))
+        self.assertTrue(inspection.is_callable(OldCallable()))
+        self.assertFalse(inspection.is_callable(Noncallable()))
+        self.assertFalse(inspection.is_callable(OldNoncallable()))
+        self.assertFalse(inspection.is_callable(None))
