Merge with tip.

marienz · marienz · commit ec0230c1a15c · 2010-02-11T00:39:38.000+01:00
diff --git a/AUTHORS b/AUTHORS
@@ -8,6 +8,6 @@ Other contributors are (in alphabetical order):
 * Federico Ceratto <federico dot ceratto at gmail dot com>
 * Pavel Panchekha <pavpanchekha at gmail dot com>
 * Simon de Vlieger <simon at ikanobori dot jp>
-
+* Marien Zwart <marien dot zwart at gmail dot com>
 
 Many thanks for all contributions!
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1610,6 +1610,7 @@ def main(args=None, locals_=None, banner=None):
 
 
 if __name__ == '__main__':
+    from bpython.cli import main
     main()
 
 # vim: sw=4 ts=4 sts=4 ai et
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -695,4 +695,5 @@ def main(args=None):
 
 
 if __name__ == '__main__':
+    from bpython.gtk_ import main
     main()
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -75,6 +75,10 @@ def find_modules(path):
             # Possibly a package
             if '.' in name:
                 continue
+        elif os.path.isdir(os.path.join(path, name)):
+            # Unfortunately, CPython just crashes if there is a directory
+            # which ends with a python extension, so work around.
+            continue
         name = os.path.splitext(name)[0]
         try:
             fo, pathname, _ = imp.find_module(name, [path])
@@ -99,6 +103,8 @@ def find_all_modules(path=None):
         path = sys.path
 
     for p in path:
+        if not path:
+            path = os.curdir
         for module in find_modules(p):
             modules.add(module)
             yield
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
 

Original file line number	Diff line number	Diff line change
`@@ -695,4 +695,5 @@ def main(args=None):`
`695`	`695`
`696`	`696`
`697`	`697`	`if __name__ == '__main__':`
	`698`	`+ from bpython.gtk_ import main`
`698`	`699`	`main()`