Merge pull request #8147 from minrk/bigsplit-console

Big Split: IPython.terminal.console -> jupyter_console

IPython/terminal/console.py

@@ -0,0 +1,20 b''
+"""
+Shim to maintain backwards compatibility with old IPython.terminal.console imports.
+"""
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+from __future__ import print_function
+
+import sys
+from warnings import warn
+
+warn("The `IPython.terminal.console` package has been deprecated. "
+     "You should import from jupyter_console instead.")
+
+from IPython.utils.shimmodule import ShimModule
+
+# Unconditionally insert the shim into sys.modules so that further import calls
+# trigger the custom attribute access above
+
+sys.modules['IPython.terminal.console'] = ShimModule('console', mirror='jupyter_console')

IPython/utils/shimmodule.py

@@ -3,6 +3,7 b''
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import sys
 import types
 
 class ShimModule(types.ModuleType):
@@ -10,6 +11,8 b' class ShimModule(types.ModuleType):'
     def __init__(self, *args, **kwargs):
         self._mirror = kwargs.pop("mirror")
         super(ShimModule, self).__init__(*args, **kwargs)
+        if sys.version_info >= (3,4):
+            self.__spec__ = __import__(self._mirror).__spec__
 
     def __getattr__(self, key):
         # Use the equivalent of import_item(name), see below