bpython
diff --git a/‎bpython/autocomplete.py‎
Lines changed: 8 additions & 4 deletions b/‎bpython/autocomplete.py‎
Lines changed: 8 additions & 4 deletions
diff --git a/‎bpython/cli.py‎
Lines changed: 1 addition & 4 deletions b/‎bpython/cli.py‎
Lines changed: 1 addition & 4 deletions
diff --git a/‎bpython/curtsies.py‎
Lines changed: 1 addition & 2 deletions b/‎bpython/curtsies.py‎
Lines changed: 1 addition & 2 deletions
@@ -1,6 +1,7 @@
 # The MIT License
 #
 # Copyright (c) 2009-2015 the bpython authors.
+# Copyright (c) 2015-2020 Sebastian Ramacher
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -34,7 +35,6 @@
 
 from enum import Enum
 from . import inspection
-from . import importcompletion
 from . import line as lineparts
 from .line import LinePart
 from .lazyre import LazyReCompile
@@ -285,8 +285,12 @@ def matches(self, cursor_offset, line, **kwargs):
 
 
 class ImportCompletion(BaseCompletionType):
+    def __init__(self, module_gatherer, mode=AutocompleteModes.SIMPLE):
+        super().__init__(False, mode)
+        self.module_gatherer = module_gatherer
+
     def matches(self, cursor_offset, line, **kwargs):
-        return importcompletion.complete(cursor_offset, line)
+        return self.module_gatherer.complete(cursor_offset, line)
 
     def locate(self, current_offset, line):
         return lineparts.current_word(current_offset, line)
@@ -656,10 +660,10 @@ def get_completer(completers, cursor_offset, line, **kwargs):
     return [], None
 
 
-def get_default_completer(mode=AutocompleteModes.SIMPLE):
+def get_default_completer(mode=AutocompleteModes.SIMPLE, module_gatherer=None):
     return (
         DictKeyCompletion(mode=mode),
-        ImportCompletion(mode=mode),
+        ImportCompletion(module_gatherer, mode=mode),
         FilenameCompletion(mode=mode),
         MagicMethodCompletion(mode=mode),
         MultilineJediCompletion(mode=mode),
 
@@ -66,9 +66,6 @@
 from pygments.token import Token
 from .formatter import BPythonFormatter
 
-# This for completion
-from . import importcompletion
-
 # This for config
 from .config import Struct, getpreferredencoding
 
@@ -1784,7 +1781,7 @@ def idle(caller):
     sure it happens conveniently."""
     global DO_RESIZE
 
-    if importcompletion.find_coroutine() or caller.paste_mode:
+    if caller.module_gatherer.find_coroutine() or caller.paste_mode:
         caller.scr.nodelay(True)
         key = caller.scr.getch()
         caller.scr.nodelay(False)
 
@@ -13,7 +13,6 @@
 from . import args as bpargs
 from . import translations
 from .translations import _
-from .importcompletion import find_coroutine
 from .curtsiesfrontend import events as bpythonevents
 from . import inspection
 from .repl import extract_exit_value
@@ -113,7 +112,7 @@ def mainloop(self, interactive=True, paste=None):
         # do a display before waiting for first event
         self.process_event_and_paint(None)
         inputs = combined_events(self.input_generator)
-        while find_coroutine():
+        while self.module_gatherer.find_coroutine():
             e = inputs.send(0)
             if e is not None:
                 self.process_event_and_paint(e)