merge.

mmaker · mmaker · commit 4880ebf50093 · 2010-09-11T07:40:50.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -8,6 +8,7 @@ v0.9.8
   dropped and ~/.bpython.ini as config file location is no longer supported.
   See issue #91.
 * Fixed some issues with tuple unpacking in argspec. See issues #133 and #138.
+* Fixed a crash with non-ascii filenames in import completion. See issue #139.
 
 v0.9.7.1
 --------
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -25,6 +25,7 @@
 import os
 import sys
 
+py3 = sys.version_info[:2] >= (3, 0)
 
 # The cached list of all known modules
 modules = set()
@@ -107,6 +108,10 @@ def find_modules(path):
             fo, pathname, _ = imp.find_module(name, [path])
         except (ImportError, SyntaxError):
             continue
+        except UnicodeEncodeError:
+            # Happens with Python 3 when there is a filename in some
+            # invalid encoding
+            continue
         else:
             if fo is not None:
                 fo.close()
@@ -129,6 +134,12 @@ def find_all_modules(path=None):
         if not p:
             p = os.curdir
         for module in find_modules(p):
+            if not py3 and not isinstance(module, unicode):
+                try:
+                    module = module.decode(sys.getfilesystemencoding())
+                except UnicodeDecodeError:
+                    # Not importable anyway, ignore it
+                    continue
             modules.add(module)
             yield
 
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -711,8 +711,6 @@ def push(self, s, insert_into_history=True):
             signal.signal(signal.SIGINT, orig_handler)
 
     def start(self):
-        # Stolen from bpython.cli again
-        self.push('from bpython._internal import _help as help\n', False)
         self.prompt(False)
 
     def keyboard_interrupt(self):
