Merge.

Trundle · Trundle · commit c86b663d1ba5 · 2010-02-10T22:19:43.000+01:00
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
