import completion returns unicode

thomasballinger · thomasballinger · commit 592d2152d4a2 · 2015-02-17T19:17:38.000-05:00
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -166,14 +166,15 @@ def find_all_modules(path=None):
     """Return a list with all modules in `path`, which should be a list of
     directory names. If path is not given, sys.path will be used."""
     if path is None:
-        modules.update(sys.builtin_module_names)
+        modules.update(try_decode(m, 'ascii')
+                       for m in sys.builtin_module_names)
         path = sys.path
 
     for p in path:
         if not p:
             p = os.curdir
         for module in find_modules(p):
-            module = try_decode(module, sys.getfilesystemencoding())
+            module = try_decode(module, 'ascii')
             if module is None:
                 continue
             modules.add(module)
diff --git a/bpython/test/test_importcompletion.py b/bpython/test/test_importcompletion.py
@@ -10,26 +10,27 @@ class TestSimpleComplete(unittest.TestCase):
 
     def setUp(self):
         self.original_modules = importcompletion.modules
-        importcompletion.modules = ['zzabc', 'zzabd', 'zzefg', 'zzabc.e',
-                                    'zzabc.f']
+        importcompletion.modules = [u'zzabc', u'zzabd', u'zzefg', u'zzabc.e',
+                                    u'zzabc.f']
 
     def tearDown(self):
         importcompletion.modules = self.original_modules
 
     def test_simple_completion(self):
         self.assertSetEqual(importcompletion.complete(10, 'import zza'),
-                            set(['zzabc', 'zzabd']))
+                            set([u'zzabc', u'zzabd']))
 
     def test_package_completion(self):
         self.assertSetEqual(importcompletion.complete(13, 'import zzabc.'),
-                            set(['zzabc.e', 'zzabc.f']))
+                            set([u'zzabc.e', u'zzabc.f']))
 
 
 class TestRealComplete(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        [_ for _ in importcompletion.find_iterator]
+        for _ in importcompletion.find_iterator:
+            pass
         __import__('sys')
         __import__('os')
 
