Merge pull request #8884 from minrk/aimport-completer

use module completion on %aimport

IPython/core/completerlib.py

@@ -223,7 +223,7 b' def module_completion(line):'
         return ['import ']
 
     # 'from xy<tab>' or 'import xy<tab>'
-    if nwords < 3 and (words[0] in ['import','from']) :
+    if nwords < 3 and (words[0] in {'%aimport', 'import', 'from'}) :
         if nwords == 1:
             return get_root_modules()
         mod = words[1].split('.')

IPython/core/interactiveshell.py

@@ -2103,6 +2103,7 b' class InteractiveShell(SingletonConfigurable):'
 
         self.set_hook('complete_command', module_completer, str_key = 'import')
         self.set_hook('complete_command', module_completer, str_key = 'from')
+        self.set_hook('complete_command', module_completer, str_key = '%aimport')
         self.set_hook('complete_command', magic_run_completer, str_key = '%run')
         self.set_hook('complete_command', cd_completer, str_key = '%cd')
         self.set_hook('complete_command', reset_completer, str_key = '%reset')

IPython/core/tests/test_completer.py

@@ -13,11 +13,11 b' from contextlib import contextmanager'
 import nose.tools as nt
 
 from traitlets.config.loader import Config
+from IPython import get_ipython
 from IPython.core import completer
 from IPython.external.decorators import knownfailureif
 from IPython.utils.tempdir import TemporaryDirectory, TemporaryWorkingDirectory
 from IPython.utils.generics import complete_object
-from IPython.utils import py3compat
 from IPython.utils.py3compat import string_types, unicode_type
 from IPython.testing import decorators as dec
 
@@ -760,3 +760,21 b' def test_dict_key_completion_invalids():'
     _, matches = complete(line_buffer="empty['")
     _, matches = complete(line_buffer="name_error['")
     _, matches = complete(line_buffer="d['\\")  # incomplete escape
+
+def test_aimport_module_completer():
+    ip = get_ipython()
+    _, matches = ip.complete('i', '%aimport i')
+    nt.assert_in('io', matches)
+    nt.assert_not_in('int', matches)
+
+def test_import_module_completer():
+    ip = get_ipython()
+    _, matches = ip.complete('i', 'import i')
+    nt.assert_in('io', matches)
+    nt.assert_not_in('int', matches)
+
+def test_from_module_completer():
+    ip = get_ipython()
+    _, matches = ip.complete('B', 'from io import B')
+    nt.assert_in('BytesIO', matches)
+    nt.assert_not_in('BaseException', matches)