diff --git a/IPython/terminal/console/app.py b/IPython/terminal/console/app.py index 01948fc..9023a4f 100644 --- a/IPython/terminal/console/app.py +++ b/IPython/terminal/console/app.py @@ -14,21 +14,16 @@ Authors: # Imports #----------------------------------------------------------------------------- import signal -import sys -import time from IPython.terminal.ipapp import TerminalIPythonApp, frontend_flags as term_flags from IPython.utils.traitlets import ( - Dict, List, Unicode, Int, CaselessStrEnum, CBool, Any + Dict, Any ) -from IPython.utils.warn import warn,error +from IPython.utils.warn import 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.consoleapp import ( - IPythonConsoleApp, app_aliases, app_flags, aliases, app_aliases, flags + IPythonConsoleApp, app_aliases, app_flags, aliases, flags ) from IPython.terminal.console.interactiveshell import ZMQTerminalInteractiveShell diff --git a/IPython/terminal/console/interactiveshell.py b/IPython/terminal/console/interactiveshell.py index 095b6a8..1591c7c 100644 --- a/IPython/terminal/console/interactiveshell.py +++ b/IPython/terminal/console/interactiveshell.py @@ -30,9 +30,8 @@ try: except: from IPython.utils.nested_context import nested -from IPython.core.alias import AliasManager, AliasError from IPython.core import page -from IPython.utils.warn import warn, error, fatal +from IPython.utils.warn import warn, error from IPython.utils import io from IPython.utils.traitlets import List, Enum, Any, Instance, Unicode from IPython.utils.tempdir import NamedFileInTemporaryDirectory diff --git a/IPython/terminal/console/tests/test_console.py b/IPython/terminal/console/tests/test_console.py index 37853e3..70d5b82 100644 --- a/IPython/terminal/console/tests/test_console.py +++ b/IPython/terminal/console/tests/test_console.py @@ -18,7 +18,6 @@ import nose.tools as nt from nose import SkipTest from IPython.testing import decorators as dec -from IPython.testing import tools as tt from IPython.utils import py3compat from IPython.utils.process import find_cmd diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py index 8969878..fb2032d 100644 --- a/IPython/terminal/interactiveshell.py +++ b/IPython/terminal/interactiveshell.py @@ -17,9 +17,7 @@ from __future__ import print_function import bdb import os -import re import sys -import textwrap # We need to use nested to support python 2.6, once we move to >=2.7, we can # use the with keyword's new builtin support for nested managers diff --git a/IPython/terminal/ipapp.py b/IPython/terminal/ipapp.py index 09b3a21..642713e 100755 --- a/IPython/terminal/ipapp.py +++ b/IPython/terminal/ipapp.py @@ -51,7 +51,7 @@ from IPython.terminal.interactiveshell import TerminalInteractiveShell from IPython.utils import warn from IPython.utils.path import get_ipython_dir, check_for_old_config from IPython.utils.traitlets import ( - Bool, List, Dict, CaselessStrEnum + Bool, List, Dict, ) #-----------------------------------------------------------------------------