From 7892032de02c14059f8b719f159d88db3776653e 2009-07-01 23:04:55 From: Brian Granger Date: 2009-07-01 23:04:55 Subject: [PATCH] completer.py => core/completer.py and imports updated. --- diff --git a/IPython/Extensions/ipy_greedycompleter.py b/IPython/Extensions/ipy_greedycompleter.py index 37142d7..38dcb29 100644 --- a/IPython/Extensions/ipy_greedycompleter.py +++ b/IPython/Extensions/ipy_greedycompleter.py @@ -69,7 +69,7 @@ def main(): import IPython.rlineimpl as readline readline.set_completer_delims(" \n\t") # monkeypatch - the code will be folded to normal completer later on - import IPython.completer - IPython.completer.Completer.attr_matches = attr_matches + import IPython.core.completer + IPython.core.completer.Completer.attr_matches = attr_matches main() \ No newline at end of file diff --git a/IPython/completer.py b/IPython/core/completer.py similarity index 100% rename from IPython/completer.py rename to IPython/core/completer.py diff --git a/IPython/core/tests/test_imports.py b/IPython/core/tests/test_imports.py new file mode 100644 index 0000000..8a2770e --- /dev/null +++ b/IPython/core/tests/test_imports.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python +# encoding: utf-8 + +def test_import_completer(): + from IPython.core import completer + diff --git a/IPython/iplib.py b/IPython/iplib.py index ccf0f72..26e9ba0 100644 --- a/IPython/iplib.py +++ b/IPython/iplib.py @@ -1423,7 +1423,7 @@ class InteractiveShell(object,Magic): else: sys.modules['readline'] = readline import atexit - from IPython.completer import IPCompleter + from IPython.core.completer import IPCompleter self.Completer = IPCompleter(self, self.user_ns, self.user_global_ns, diff --git a/docs/source/development/reorg.txt b/docs/source/development/reorg.txt index d3e68c9..822b6f1 100644 --- a/docs/source/development/reorg.txt +++ b/docs/source/development/reorg.txt @@ -85,8 +85,13 @@ level modules. Where things will be moved ========================== +* :file:`background_jobs.py`. Move to :file:`IPython/lib/backgroundjobs.py`. + * :file:`ColorANSI.py`. Move to :file:`IPython/utils/coloransi.py`. +* :file:`completer.py`. Move to :file:`IPython/core/completer.py`. + + * :file:`ConfigLoader.py`. Move to :file:`IPython/config/configloader.py`. * :file:`CrashHandler.py`. Move to :file:`IPython/core/crashhandler`. @@ -130,9 +135,8 @@ Where things will be moved * :file:`UserConfig`. Move to a subdirectory of :file:`IPython.config`. -* :file:`background_jobs.py`. Move to :file:`IPython/lib/backgroundjobs.py`. -* :file:`completer.py`. Move to :file:`IPython/core/completer.py`. + * :file:`config`. Good where it is!