diff --git a/IPython/Extensions/ipy_defaults.py b/IPython/Extensions/ipy_defaults.py index 5565738..665a124 100644 --- a/IPython/Extensions/ipy_defaults.py +++ b/IPython/Extensions/ipy_defaults.py @@ -12,7 +12,7 @@ ipy_profile_PROFILENAME etc. """ -import IPython.rlineimpl as readline +import IPython.utils.rlineimpl as readline from IPython.core import ipapi ip = ipapi.get() diff --git a/IPython/Extensions/ipy_greedycompleter.py b/IPython/Extensions/ipy_greedycompleter.py index 7ab77e7..17628f9 100644 --- a/IPython/Extensions/ipy_greedycompleter.py +++ b/IPython/Extensions/ipy_greedycompleter.py @@ -67,7 +67,7 @@ def attr_matches(self, text): return res def main(): - import IPython.rlineimpl as readline + import IPython.utils.rlineimpl as readline readline.set_completer_delims(" \n\t") # monkeypatch - the code will be folded to normal completer later on import IPython.core.completer diff --git a/IPython/core/completer.py b/IPython/core/completer.py index 9149607..15f10f9 100644 --- a/IPython/core/completer.py +++ b/IPython/core/completer.py @@ -70,7 +70,7 @@ import os import re import shlex import sys -import IPython.rlineimpl as readline +import IPython.utils.rlineimpl as readline import itertools from IPython.utils.ipstruct import Struct from IPython.core import ipapi diff --git a/IPython/core/iplib.py b/IPython/core/iplib.py index 99c8175..1c06111 100644 --- a/IPython/core/iplib.py +++ b/IPython/core/iplib.py @@ -1416,7 +1416,7 @@ class InteractiveShell(object,Magic): """Command history completion/saving/reloading.""" - import IPython.rlineimpl as readline + import IPython.utils.rlineimpl as readline if not readline.have_readline: self.has_readline = 0 diff --git a/IPython/core/magic.py b/IPython/core/magic.py index eff1cd2..828e840 100644 --- a/IPython/core/magic.py +++ b/IPython/core/magic.py @@ -2462,7 +2462,7 @@ Currently the magic system has the following functions:\n""" # local shortcut shell = self.shell - import IPython.rlineimpl as readline + import IPython.utils.rlineimpl as readline if not readline.have_readline and sys.platform == "win32": msg = """\ diff --git a/IPython/utils/genutils.py b/IPython/utils/genutils.py index 440c21e..640b025 100644 --- a/IPython/utils/genutils.py +++ b/IPython/utils/genutils.py @@ -112,7 +112,7 @@ class IOTerm: # Global variable to be used for all I/O Term = IOTerm() -import IPython.rlineimpl as readline +import IPython.utils.rlineimpl as readline # Remake Term to use the readline i/o facilities if sys.platform == 'win32' and readline.have_readline: diff --git a/IPython/rlineimpl.py b/IPython/utils/rlineimpl.py similarity index 96% rename from IPython/rlineimpl.py rename to IPython/utils/rlineimpl.py index aa0ba63..f13b641 100644 --- a/IPython/rlineimpl.py +++ b/IPython/utils/rlineimpl.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ Imports and provides the 'correct' version of readline for the platform. -Readline is used throughout IPython as 'import IPython.rlineimpl as readline'. +Readline is used throughout IPython as 'import IPython.utils.rlineimpl as readline'. In addition to normal readline stuff, this module provides have_readline boolean and _outputfile variable used in genutils. diff --git a/IPython/utils/tests/test_imports.py b/IPython/utils/tests/test_imports.py index 30e7773..12fcf52 100644 --- a/IPython/utils/tests/test_imports.py +++ b/IPython/utils/tests/test_imports.py @@ -21,3 +21,6 @@ def test_import_platutils(): def test_import_PyColorize(): from IPython.utils import PyColorize + +def test_import_rlineimpl(): + from IPython.utils import rlineimpl \ No newline at end of file