##// END OF EJS Templates
Fix some import....
Matthias Bussonnier -
Show More
@@ -47,9 +47,7 b' from .core import release'
47 from .core.application import Application
47 from .core.application import Application
48 from .terminal.embed import embed
48 from .terminal.embed import embed
49
49
50 from .core.error import TryNext
51 from .core.interactiveshell import InteractiveShell
50 from .core.interactiveshell import InteractiveShell
52 from .testing import test
53 from .utils.sysinfo import sys_info
51 from .utils.sysinfo import sys_info
54 from .utils.frame import extract_module_locals
52 from .utils.frame import extract_module_locals
55
53
@@ -4,7 +4,6 b' Shim to maintain backwards compatibility with old IPython.consoleapp imports.'
4 # Copyright (c) IPython Development Team.
4 # Copyright (c) IPython Development Team.
5 # Distributed under the terms of the Modified BSD License.
5 # Distributed under the terms of the Modified BSD License.
6
6
7 import sys
8 from warnings import warn
7 from warnings import warn
9
8
10 warn("The `IPython.consoleapp` package has been deprecated. "
9 warn("The `IPython.consoleapp` package has been deprecated. "
@@ -235,7 +235,7 b' class BaseIPythonApplication(Application):'
235 path = os.path.join(new, d)
235 path = os.path.join(new, d)
236 try:
236 try:
237 ensure_dir_exists(path)
237 ensure_dir_exists(path)
238 except OSError:
238 except OSError as e:
239 # this will not be EEXIST
239 # this will not be EEXIST
240 self.log.error("couldn't create path %s: %s", path, e)
240 self.log.error("couldn't create path %s: %s", path, e)
241 self.log.debug("IPYTHONDIR set to: %s" % new)
241 self.log.debug("IPYTHONDIR set to: %s" % new)
@@ -18,6 +18,7 b' import shutil'
18 import sys
18 import sys
19 import tempfile
19 import tempfile
20 import warnings
20 import warnings
21 from warnings import warn
21 from .capture import CapturedIO, capture_output
22 from .capture import CapturedIO, capture_output
22 from .py3compat import string_types, input, PY3
23 from .py3compat import string_types, input, PY3
23
24
General Comments 0
You need to be logged in to leave comments. Login now