mirror of
https://github.com/jupyter/notebook.git
synced 2025-01-30 12:11:32 +08:00
Updating import statements after moving notebook files around.
This commit is contained in:
parent
6b7fd467ee
commit
f17c77eba0
@ -22,7 +22,7 @@ from tornado.escape import url_escape
|
||||
|
||||
from IPython.lib.security import passwd_check
|
||||
|
||||
from .base import IPythonHandler
|
||||
from ..base.handlers import IPythonHandler
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Handler
|
||||
|
@ -16,7 +16,7 @@ Authors:
|
||||
# Imports
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
from .base import IPythonHandler
|
||||
from ..base.handlers import IPythonHandler
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Handler
|
||||
|
@ -20,7 +20,7 @@ from tornado import web
|
||||
|
||||
from zmq.utils import jsonapi
|
||||
|
||||
from .base import IPythonHandler
|
||||
from ..base.handlers import IPythonHandler
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Cluster handlers
|
||||
|
@ -27,7 +27,7 @@ from IPython.kernel.zmq.session import Session
|
||||
from IPython.utils.jsonutil import date_default
|
||||
from IPython.utils.py3compat import PY3
|
||||
|
||||
from .base import IPythonHandler
|
||||
from ..base.handlers import IPythonHandler
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Kernel handlers
|
||||
|
@ -62,33 +62,14 @@ from tornado import web
|
||||
|
||||
# Our own libraries
|
||||
from IPython.frontend.html.notebook import DEFAULT_STATIC_FILES_PATH
|
||||
from .kernelmanager import MappingKernelManager
|
||||
|
||||
from .handlers.clustersapi import (
|
||||
MainClusterHandler, ClusterProfileHandler, ClusterActionHandler
|
||||
)
|
||||
from .handlers.kernelsapi import (
|
||||
MainKernelHandler, KernelHandler, KernelActionHandler,
|
||||
IOPubHandler, StdinHandler, ShellHandler
|
||||
)
|
||||
from .handlers.notebooksapi import (
|
||||
NotebookRootHandler, NotebookHandler,
|
||||
NotebookCheckpointsHandler, ModifyNotebookCheckpointsHandler
|
||||
)
|
||||
from .handlers.tree import ProjectDashboardHandler
|
||||
from .handlers.login import LoginHandler
|
||||
from .handlers.logout import LogoutHandler
|
||||
from .handlers.notebooks import (
|
||||
NewHandler, NamedNotebookHandler,
|
||||
NotebookCopyHandler, NotebookRedirectHandler
|
||||
)
|
||||
from .kernels.kernelmanager import MappingKernelManager
|
||||
from .notebooks.nbmanager import NotebookManager
|
||||
from .notebooks.filenbmanager import FileNotebookManager
|
||||
from .clusters.clustermanager import ClusterManager
|
||||
|
||||
from .handlers.base import AuthenticatedFileHandler
|
||||
from .handlers.files import FileFindHandler
|
||||
|
||||
from .nbmanager import NotebookManager
|
||||
from .filenbmanager import FileNotebookManager
|
||||
from .clustermanager import ClusterManager
|
||||
from .base.handlers import AuthenticatedFileHandler
|
||||
from .base.files import FileFindHandler
|
||||
|
||||
from IPython.config.application import catch_config_error, boolean_flag
|
||||
from IPython.core.application import BaseIPythonApplication
|
||||
@ -140,7 +121,7 @@ def random_ports(port, n):
|
||||
|
||||
def load_handlers(name):
|
||||
"""Load the (URL pattern, handler) tuples for each component."""
|
||||
name = 'IPython.frontend.html.notebook.handlers.' + name
|
||||
name = 'IPython.frontend.html.notebook.' + name
|
||||
mod = __import__(name, fromlist=['default_handlers'])
|
||||
return mod.default_handlers
|
||||
|
||||
@ -156,14 +137,14 @@ class NotebookWebApplication(web.Application):
|
||||
|
||||
# Load the (URL pattern, handler) tuples for each component.
|
||||
handlers = []
|
||||
handlers.extend(load_handlers('base'))
|
||||
handlers.extend(load_handlers('tree'))
|
||||
handlers.extend(load_handlers('login'))
|
||||
handlers.extend(load_handlers('logout'))
|
||||
handlers.extend(load_handlers('notebooks'))
|
||||
handlers.extend(load_handlers('kernelsapi'))
|
||||
handlers.extend(load_handlers('notebooksapi'))
|
||||
handlers.extend(load_handlers('clustersapi'))
|
||||
handlers.extend(load_handlers('base.handlers'))
|
||||
handlers.extend(load_handlers('tree.handlers'))
|
||||
handlers.extend(load_handlers('auth.login'))
|
||||
handlers.extend(load_handlers('auth.logout'))
|
||||
handlers.extend(load_handlers('notebooks.handlers'))
|
||||
handlers.extend(load_handlers('kernels.handlers'))
|
||||
handlers.extend(load_handlers('notebooks.apihandlers'))
|
||||
handlers.extend(load_handlers('clusters.handlers'))
|
||||
handlers.extend([
|
||||
(r"/files/(.*)", AuthenticatedFileHandler, {'path' : notebook_manager.notebook_dir}),
|
||||
])
|
||||
@ -485,7 +466,7 @@ class NotebookApp(BaseIPythonApplication):
|
||||
else:
|
||||
self.log.info("Using MathJax: %s", new)
|
||||
|
||||
notebook_manager_class = DottedObjectName('IPython.frontend.html.notebook.filenbmanager.FileNotebookManager',
|
||||
notebook_manager_class = DottedObjectName('IPython.frontend.html.notebook.notebooks.filenbmanager.FileNotebookManager',
|
||||
config=True,
|
||||
help='The notebook manager class to use.')
|
||||
|
||||
|
@ -22,7 +22,7 @@ from zmq.utils import jsonapi
|
||||
|
||||
from IPython.utils.jsonutil import date_default
|
||||
|
||||
from .base import IPythonHandler, authenticate_unless_readonly
|
||||
from ..base.handlers import IPythonHandler, authenticate_unless_readonly
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Notebook web service handlers
|
||||
|
@ -20,7 +20,7 @@ import os
|
||||
from tornado import web
|
||||
HTTPError = web.HTTPError
|
||||
|
||||
from .base import IPythonHandler, authenticate_unless_readonly
|
||||
from ..base.handlers import IPythonHandler, authenticate_unless_readonly
|
||||
from ..utils import url_path_join
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
|
@ -16,7 +16,7 @@ Authors:
|
||||
# Imports
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
from .base import IPythonHandler, authenticate_unless_readonly
|
||||
from ..base.handlers import IPythonHandler, authenticate_unless_readonly
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Handlers
|
||||
|
Loading…
Reference in New Issue
Block a user