Search for import completion modules in idle generator

thomasballinger · thomasballinger · commit 4442a756efb9 · 2014-03-26T21:33:55.000-04:00
A different technique that amygdalama and I talked about, but required
modifications to curtsies: an idle function like cli.py uses.

I pulled from amygdalama's repo because I thought we would use that code, and it
will be useful when we add Windows support, but it's not necessary right now.
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -15,6 +15,7 @@
 from bpython.curtsiesfrontend.coderunner import SystemExitFromCodeGreenlet
 from bpython import args as bpargs
 from bpython.translations import _
+from bpython.importcompletion import find_iterator
 
 def main(args=None, locals_=None, banner=None):
     config, options, exec_args = bpargs.parse(args, (
@@ -78,7 +79,7 @@ def process_event(e):
                     process_event(paste)
 
                 while True:
-                    process_event(tc.get_event())
+                    process_event(tc.get_event(idle=find_iterator))
 
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -220,7 +220,6 @@ def smarter_request_refresh():
 
         self.width = None  # will both be set by a window resize event
         self.height = None
-        self.start_background_tasks()
 
     def __enter__(self):
         self.orig_stdout = sys.stdout
@@ -236,18 +235,6 @@ def __exit__(self, *args):
         sys.stdout = self.orig_stdout
         sys.stderr = self.orig_stderr
 
-    def start_background_tasks(self):
-        """starts tasks that should run on startup in the background"""
-
-        def importcompletion_thread():
-            #TODO use locks or something to avoid error on import completion right at startup
-            while importcompletion.find_coroutine(): # returns None when fully initialized
-                pass
-
-        t = threading.Thread(target=importcompletion_thread)
-        t.daemon = True
-        t.start()
-
     def clean_up_current_line_for_exit(self):
         """Called when trying to exit to prep for final paint"""
         logging.debug('unhighlighting paren for exit')
@@ -946,6 +933,7 @@ def request_refresh():
         r.width = 50
         r.height = 10
         while True:
+            [_ for _ in importcompletion.find_iterator]
             r.dumb_print_output()
             r.dumb_input(refreshes)
 
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -53,9 +53,6 @@ def complete(line, cw):
     if not cw:
         return None
 
-    if not fully_loaded:
-        return []
-
     tokens = line.split()
     if tokens[0] not in ['from', 'import']:
         return None
diff --git a/setup.py b/setup.py
@@ -153,7 +153,7 @@ def initialize_options(self):
         'pygments'
     ],
     extras_require = {
-        'curtsies': ['curtsies>=0.0.27', 'greenlet'],
+        'curtsies': ['curtsies>=0.0.28', 'greenlet'],
         'urwid' : ['urwid']
     },
     tests_require = ['mock'],
