mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-21 04:10:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-quickstart

Browse Source
This commit is contained in:
Preston Holmes 2015-04-13 17:09:38 -04:00 committed by Min RK
commit 9ff9e78389
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jupyter_notebook/services/clusters/clustermanager.py
View File

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

3
jupyter_notebook/services/contents/fileio.py
View File

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

3
jupyter_notebook/services/contents/filemanager.py
View File

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