Merge pull request #8417 from minrk/qtconsole

jupyter_qtconsole is now qtconsole

IPython/nbconvert.py

@@ -16,4 +16,4 b' from IPython.utils.shimmodule import ShimModule'
 # trigger the custom attribute access above
 
 sys.modules['IPython.nbconvert'] = ShimModule(
-    src='IPython.nbconvert', mirror='jupyter_nbconvert')
+    src='IPython.nbconvert', mirror='nbconvert')

IPython/qt.py

@@ -8,11 +8,11 b' import sys'
 from warnings import warn
 
 warn("The `IPython.qt` package has been deprecated. "
-     "You should import from jupyter_qtconsole instead.")
+     "You should import from qtconsole 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.qt'] = ShimModule(src='IPython.qt', mirror='jupyter_qtconsole')
+sys.modules['IPython.qt'] = ShimModule(src='IPython.qt', mirror='qtconsole')

IPython/terminal/ipapp.py

@@ -207,7 +207,7 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
         ]
 
     subcommands = dict(
-        qtconsole=('jupyter_qtconsole.console.qtconsoleapp.JupyterQtConsoleApp',
+        qtconsole=('qtconsole.console.qtconsoleapp.JupyterQtConsoleApp',
             """DEPRECATD: Launch the Jupyter Qt Console."""
         ),
         notebook=('jupyter_notebook.notebookapp.NotebookApp',
@@ -228,7 +228,7 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
         history=('IPython.core.historyapp.HistoryApp',
             "Manage the IPython history database."
         ),
-        nbconvert=('jupyter_nbconvert.nbconvertapp.NbConvertApp',
+        nbconvert=('nbconvert.nbconvertapp.NbConvertApp',
             "DEPRECATED: Convert notebooks to/from other formats."
         ),
         trust=('jupyter_nbformat.sign.TrustNotebookApp',

IPython/utils/io.py

@@ -241,7 +241,7 b' rprinte = raw_print_err'
 
 
 def unicode_std_stream(stream='stdout'):
-    """DEPRECATED, moved to jupyter_nbconvert.utils.io"""
-    warn("IPython.utils.io.unicode_std_stream has moved to jupyter_nbconvert.utils.io")
-    from jupyter_nbconvert.utils.io import unicode_std_stream
+    """DEPRECATED, moved to nbconvert.utils.io"""
+    warn("IPython.utils.io.unicode_std_stream has moved to nbconvert.utils.io")
+    from nbconvert.utils.io import unicode_std_stream
     return unicode_std_stream(stream)

setup.py

@@ -202,14 +202,14 b" pyzmq = 'pyzmq>=13'"
 
 extras_require = dict(
     parallel = ['ipyparallel'],
-    qtconsole = ['jupyter_qtconsole'],
+    qtconsole = ['qtconsole'],
     doc = ['Sphinx>=1.1', 'numpydoc'],
     test = ['nose>=0.10.1', 'requests'],
     terminal = [],
     kernel = ['ipython_kernel'],
     nbformat = ['jupyter_nbformat'],
     notebook = ['jupyter_notebook'],
-    nbconvert = ['jupyter_nbconvert']
+    nbconvert = ['nbconvert'],
 )
 
 if sys.version_info < (3, 3):