module completion loading is now done in the background on startup

bob · bob · commit db899380c3ea · 2009-05-31T12:05:28.000+01:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1331,12 +1331,6 @@ def tab(self):
             self.print_line(self.s)
             return True
 
-        if not importcompletion.modules:
-            line = self.s.lstrip()
-            if line.startswith('from ') or line.startswith('import '):
-                self.statusbar.message('Scanning for modules...')
-                importcompletion.reload()
-
         if not OPTS.auto_display_list and not self.list_win_visible:
             self.complete(tab=True)
             return True
@@ -1699,6 +1693,7 @@ def idle(caller):
 
     global stdscr
 
+    importcompletion.find_coroutine()
     caller.statusbar.check()
 
     if DO_RESIZE:
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -27,8 +27,8 @@
 
 
 # The cached list of all known modules
-modules = list()
-
+modules = set()
+fully_loaded = False
 
 def complete(line, cw):
     """Construct a full list of possibly completions for imports."""
@@ -88,18 +88,29 @@ def find_modules(path):
 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."""
-    modules = set()
     if path is None:
         modules.update(sys.builtin_module_names)
         path = sys.path
 
     for p in path:
         modules.update(find_modules(p))
-    
-    return modules
+        yield
+
+def find_coroutine():
+    global fully_loaded
 
+    if fully_loaded:
+        return
+
+    try:
+        find_iterator.next()
+    except StopIteration:
+        fully_loaded = True
 
 def reload():
     """Refresh the list of known modules."""
-    global modules
-    modules = find_all_modules()
+    modules.clear()
+    for _ in find_all_modules():
+        pass
+
+find_iterator = find_all_modules()
