Use find_all_modules and reload instead of find_iterator

sebastinas · sebastinas · commit 79e60136e133 · 2020-12-30T18:51:20.000+01:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -13,7 +13,7 @@
 from . import args as bpargs
 from . import translations
 from .translations import _
-from .importcompletion import find_iterator
+from .importcompletion import find_all_modules
 from .curtsiesfrontend import events as bpythonevents
 from . import inspection
 from .repl import extract_exit_value
@@ -113,7 +113,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)
-        for unused in find_iterator:
+        for unused in find_all_modules():
             e = inputs.send(0)
             if e is not None:
                 self.process_event_and_paint(e)
diff --git a/bpython/test/test_importcompletion.py b/bpython/test/test_importcompletion.py
@@ -31,16 +31,10 @@ def test_package_completion(self):
 class TestRealComplete(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        for _ in importcompletion.find_iterator:
-            pass
+        importcompletion.reload()
         __import__("sys")
         __import__("os")
 
-    @classmethod
-    def tearDownClass(cls):
-        importcompletion.find_iterator = importcompletion.find_all_modules()
-        importcompletion.modules = set()
-
     def test_from_attribute(self):
         self.assertSetEqual(
             importcompletion.complete(19, "from sys import arg"), {"argv"}
