Introduce inspection.is_callable.

Trundle · Trundle · commit bfde98e1c02c · 2010-02-10T22:28:05.000+01:00
It uses isinstance(x, collections.Callable) where available and falls
back to callable(x) otherwise. Also works around Python issue #7624.
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -22,6 +22,7 @@
 #
 
 from __future__ import with_statement
+import collections
 import inspect
 import pydoc
 import re
@@ -31,6 +32,17 @@
 from pygments.lexers import PythonLexer
 from pygments.token import Token
 
+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
 
 py3 = sys.version_info[0] == 3
 
@@ -223,3 +235,13 @@ def is_eval_safe_name(string):
         return all(part.isidentifier() for part in string.split('.'))
     else:
         return all(_name.match(part) for part in string.split('.'))
+
+
+def is_callable(obj):
+    if has_instance_type and isinstance(obj, types.InstanceType):
+        # Work around a Python bug, see issue 7624
+        return callable(obj)
+    elif has_collections_callable:
+        return isinstance(obj, collections.Callable)
+    else:
+        return callable(obj)
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -363,7 +363,7 @@ def attr_lookup(self, obj, expr, attr):
     def _callable_postfix(self, value, word):
         """rlcompleter's _callable_postfix done right."""
         with inspection.AttrCleaner(value):
-            if hasattr(value, '__call__'):
+            if inspection.is_callable(value):
                 word += '('
         return word
 
