Merge branch 'master' into dev-quickstart

jupyter_notebook/services/clusters/clustermanager.py

@@ -53,10 +53,10 @@ class ClusterManager(LoggingConfigurable):
         """List all profiles in the ipython_dir and cwd.
         """
         try:
-            from IPythons.paths import get_ipython_dir
+            from IPython.paths import get_ipython_dir
             from IPython.core.profileapp import list_profiles_in
-        except ImportError:
-            self.log.info("IPython not available")
+        except ImportError as e:
+            self.log.info("IPython not available: %s", e)
             return
         stale = set(self.profiles)
         for path in [get_ipython_dir(), py3compat.getcwd()]:

jupyter_notebook/services/contents/fileio.py

@@ -19,7 +19,8 @@ from jupyter_notebook.utils import (
     to_api_path,
     to_os_path,
 )
-from IPython import nbformat
+import jupyter_nbformat as nbformat
+
 from ipython_genutils.py3compat import str_to_unicode
 
 

jupyter_notebook/services/contents/filemanager.py

@@ -8,6 +8,7 @@ import io
 import os
 import shutil
 import mimetypes
+import jupyter_nbformat as nbformat
 
 from tornado import web
 
@@ -15,7 +16,7 @@ from .filecheckpoints import FileCheckpoints
 from .fileio import FileManagerMixin
 from .manager import ContentsManager
 
-from IPython import nbformat
+
 from ipython_genutils.importstring import import_item
 from traitlets import Any, Unicode, Bool, TraitError
 from ipython_genutils.py3compat import getcwd, string_types