diff --git a/IPython/terminal/console/app.py b/IPython/terminal/console/app.py index bc60879..8381f1f 100644 --- a/IPython/terminal/console/app.py +++ b/IPython/terminal/console/app.py @@ -17,7 +17,7 @@ import signal import sys import time -from IPython.frontend.terminal.ipapp import TerminalIPythonApp, frontend_flags as term_flags +from IPython.terminal.ipapp import TerminalIPythonApp, frontend_flags as term_flags from IPython.utils.traitlets import ( Dict, List, Unicode, Int, CaselessStrEnum, CBool, Any @@ -27,11 +27,11 @@ from IPython.utils.warn import warn,error from IPython.kernel.zmq.kernelapp import IPKernelApp from IPython.kernel.zmq.session import Session, default_secure from IPython.kernel.zmq.zmqshell import ZMQInteractiveShell -from IPython.frontend.consoleapp import ( +from IPython.consoleapp import ( IPythonConsoleApp, app_aliases, app_flags, aliases, app_aliases, flags ) -from IPython.frontend.terminal.console.interactiveshell import ZMQTerminalInteractiveShell +from IPython.terminal.console.interactiveshell import ZMQTerminalInteractiveShell #----------------------------------------------------------------------------- # Globals diff --git a/IPython/terminal/console/interactiveshell.py b/IPython/terminal/console/interactiveshell.py index c723fcb..095b6a8 100644 --- a/IPython/terminal/console/interactiveshell.py +++ b/IPython/terminal/console/interactiveshell.py @@ -37,8 +37,8 @@ from IPython.utils import io from IPython.utils.traitlets import List, Enum, Any, Instance, Unicode from IPython.utils.tempdir import NamedFileInTemporaryDirectory -from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell -from IPython.frontend.terminal.console.completer import ZMQCompleter +from IPython.terminal.interactiveshell import TerminalInteractiveShell +from IPython.terminal.console.completer import ZMQCompleter class ZMQTerminalInteractiveShell(TerminalInteractiveShell):