Show More
@@ -14,21 +14,16 b' Authors:' | |||||
14 | # Imports |
|
14 | # Imports | |
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 | import signal |
|
16 | import signal | |
17 | import sys |
|
|||
18 | import time |
|
|||
19 |
|
17 | |||
20 | from IPython.terminal.ipapp import TerminalIPythonApp, frontend_flags as term_flags |
|
18 | from IPython.terminal.ipapp import TerminalIPythonApp, frontend_flags as term_flags | |
21 |
|
19 | |||
22 | from IPython.utils.traitlets import ( |
|
20 | from IPython.utils.traitlets import ( | |
23 | Dict, List, Unicode, Int, CaselessStrEnum, CBool, Any |
|
21 | Dict, Any | |
24 | ) |
|
22 | ) | |
25 |
from IPython.utils.warn import |
|
23 | from IPython.utils.warn import error | |
26 |
|
24 | |||
27 | from IPython.kernel.zmq.kernelapp import IPKernelApp |
|
|||
28 | from IPython.kernel.zmq.session import Session, default_secure |
|
|||
29 | from IPython.kernel.zmq.zmqshell import ZMQInteractiveShell |
|
|||
30 | from IPython.consoleapp import ( |
|
25 | from IPython.consoleapp import ( | |
31 |
IPythonConsoleApp, app_aliases, app_flags, aliases, |
|
26 | IPythonConsoleApp, app_aliases, app_flags, aliases, flags | |
32 | ) |
|
27 | ) | |
33 |
|
28 | |||
34 | from IPython.terminal.console.interactiveshell import ZMQTerminalInteractiveShell |
|
29 | from IPython.terminal.console.interactiveshell import ZMQTerminalInteractiveShell |
@@ -30,9 +30,8 b' try:' | |||||
30 | except: |
|
30 | except: | |
31 | from IPython.utils.nested_context import nested |
|
31 | from IPython.utils.nested_context import nested | |
32 |
|
32 | |||
33 | from IPython.core.alias import AliasManager, AliasError |
|
|||
34 | from IPython.core import page |
|
33 | from IPython.core import page | |
35 |
from IPython.utils.warn import warn, error |
|
34 | from IPython.utils.warn import warn, error | |
36 | from IPython.utils import io |
|
35 | from IPython.utils import io | |
37 | from IPython.utils.traitlets import List, Enum, Any, Instance, Unicode |
|
36 | from IPython.utils.traitlets import List, Enum, Any, Instance, Unicode | |
38 | from IPython.utils.tempdir import NamedFileInTemporaryDirectory |
|
37 | from IPython.utils.tempdir import NamedFileInTemporaryDirectory |
@@ -18,7 +18,6 b' import nose.tools as nt' | |||||
18 | from nose import SkipTest |
|
18 | from nose import SkipTest | |
19 |
|
19 | |||
20 | from IPython.testing import decorators as dec |
|
20 | from IPython.testing import decorators as dec | |
21 | from IPython.testing import tools as tt |
|
|||
22 | from IPython.utils import py3compat |
|
21 | from IPython.utils import py3compat | |
23 | from IPython.utils.process import find_cmd |
|
22 | from IPython.utils.process import find_cmd | |
24 |
|
23 |
@@ -17,9 +17,7 b' from __future__ import print_function' | |||||
17 |
|
17 | |||
18 | import bdb |
|
18 | import bdb | |
19 | import os |
|
19 | import os | |
20 | import re |
|
|||
21 | import sys |
|
20 | import sys | |
22 | import textwrap |
|
|||
23 |
|
21 | |||
24 | # We need to use nested to support python 2.6, once we move to >=2.7, we can |
|
22 | # We need to use nested to support python 2.6, once we move to >=2.7, we can | |
25 | # use the with keyword's new builtin support for nested managers |
|
23 | # use the with keyword's new builtin support for nested managers |
@@ -51,7 +51,7 b' from IPython.terminal.interactiveshell import TerminalInteractiveShell' | |||||
51 | from IPython.utils import warn |
|
51 | from IPython.utils import warn | |
52 | from IPython.utils.path import get_ipython_dir, check_for_old_config |
|
52 | from IPython.utils.path import get_ipython_dir, check_for_old_config | |
53 | from IPython.utils.traitlets import ( |
|
53 | from IPython.utils.traitlets import ( | |
54 |
Bool, List, Dict, |
|
54 | Bool, List, Dict, | |
55 | ) |
|
55 | ) | |
56 |
|
56 | |||
57 | #----------------------------------------------------------------------------- |
|
57 | #----------------------------------------------------------------------------- |
General Comments 0
You need to be logged in to leave comments.
Login now