From 655d49793ed0b710214ea84de5bad259508f8352 2015-05-08 18:42:03
From: Min RK <benjaminrk@gmail.com>
Date: 2015-05-08 18:42:03
Subject: [PATCH] jupyter_nbconvert is now nbconvert

update shims, imports, optional dependency.
---

diff --git a/IPython/nbconvert.py b/IPython/nbconvert.py
index 9b47688..7abcd0a 100644
--- a/IPython/nbconvert.py
+++ b/IPython/nbconvert.py
@@ -16,4 +16,4 @@ 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')
diff --git a/IPython/terminal/ipapp.py b/IPython/terminal/ipapp.py
index 786c08a..4d55a66 100755
--- a/IPython/terminal/ipapp.py
+++ b/IPython/terminal/ipapp.py
@@ -228,7 +228,7 @@ 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',
diff --git a/IPython/utils/io.py b/IPython/utils/io.py
index 39506b2..59f5bb8 100644
--- a/IPython/utils/io.py
+++ b/IPython/utils/io.py
@@ -241,7 +241,7 @@ 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)
diff --git a/setup.py b/setup.py
index 182f8db..1777ee5 100755
--- a/setup.py
+++ b/setup.py
@@ -209,7 +209,7 @@ extras_require = dict(
     kernel = ['ipython_kernel'],
     nbformat = ['jupyter_nbformat'],
     notebook = ['jupyter_notebook'],
-    nbconvert = ['jupyter_nbconvert']
+    nbconvert = ['nbconvert'],
 )
 
 if sys.version_info < (3, 3):