p2yq6ufca
/
monkeyking
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update dependency imports

Browse Source 
removing IPython shims
Min RK 11 years ago
parent 3add4a5df6
commit d2f3446770
148 changed files with 275 additions and 305 deletions
Show Stats Download Patch File Download Diff File

4
IPython/testing/iptest.py
Unescape View File

@ -35,8 +35,8 @@ from nose.plugins import Plugin
from nose.util import safe_str
from IPython.utils.process import is_cmd_found
from IPython.utils.py3compat import bytes_to_str
from IPython.utils.importstring import import_item
from ipython_genutils.py3compat import bytes_to_str
from ipython_genutils.importstring import import_item
from IPython.testing.plugin.ipdoctest import IPythonDoctest
from IPython.external.decorators import KnownFailure, knownfailureif

8
IPython/testing/iptestcontroller.py
Unescape View File

@ -29,9 +29,9 @@ from .iptest import (
test_for,
)
from IPython.utils.path import compress_user
from IPython.utils.py3compat import bytes_to_str
from ipython_genutils.py3compat import bytes_to_str
from IPython.utils.sysinfo import get_sys_info
from IPython.utils.tempdir import TemporaryDirectory
from ipython_genutils.tempdir import TemporaryDirectory
from IPython.utils.text import strip_ansi
try:
@ -250,7 +250,7 @@ class PyTestController(TestController):
js_prefix = 'js/'
def get_js_test_dir():
import IPython.html.tests as t
import jupyter_notebook.tests as t
return os.path.join(os.path.dirname(t.__file__), '')
def all_js_groups():
@ -348,7 +348,7 @@ class JSController(TestController):
def _init_server(self):
"Start the notebook server in a separate process"
self.server_command = command = [sys.executable,
'-m', 'IPython.html',
'-m', 'jupyter_notebook',
'--no-browser',
'--ipython-dir', self.ipydir.name,
'--notebook-dir', self.nbdir.name,

6
examples/Interactive Widgets/Custom Widget - Hello World.ipynb
Unescape View File

@ -110,7 +110,7 @@
"outputs": [],
"source": [
"from IPython.html import widgets\n",
"from IPython.utils.traitlets import Unicode\n",
"from traitlets import Unicode\n",
"\n",
"class HelloWidget(widgets.DOMWidget):\n",
" _view_name = Unicode('HelloView', sync=True)"
@ -570,7 +570,7 @@
},
"outputs": [],
"source": [
"from IPython.utils.traitlets import CInt\n",
"from traitlets import CInt\n",
"class SpinnerWidget(widgets.DOMWidget):\n",
" _view_name = Unicode('SpinnerView', sync=True)\n",
" value = CInt(0, sync=True)"
@ -757,7 +757,7 @@
"w2 = widgets.IntSlider()\n",
"display(w1,w2)\n",
"\n",
"from IPython.utils.traitlets import link\n",
"from traitlets import link\n",
"mylink = link((w1, 'value'), (w2, 'value'))"
]
},

2
examples/Interactive Widgets/Date Picker Widget.ipynb
Unescape View File

@ -24,7 +24,7 @@
"\n",
"from IPython.html import widgets # Widget definitions\n",
"from IPython.display import display # Used to display widgets in the notebook\n",
"from IPython.utils.traitlets import Unicode # Used to declare attributes of our widget"
"from traitlets import Unicode # Used to declare attributes of our widget"
]
},
{

2
examples/Interactive Widgets/Export As (nbconvert).ipynb
Unescape View File

@ -11,7 +11,7 @@
"# Widget related imports\n",
"from IPython.html import widgets\n",
"from IPython.display import display, clear_output, Javascript\n",
"from IPython.utils.traitlets import Unicode\n",
"from traitlets import Unicode\n",
"\n",
"# nbconvert related imports\n",
"from IPython.nbconvert import get_export_names, export_by_name\n",

2
examples/Interactive Widgets/File Upload Widget.ipynb
Unescape View File

@ -11,7 +11,7 @@
"import base64\n",
"from __future__ import print_function # py 2.7 compat.\n",
"from IPython.html import widgets # Widget definitions.\n",
"from IPython.utils.traitlets import Unicode # Traitlet needed to add synced attributes to the widget."
"from traitlets import Unicode # Traitlet needed to add synced attributes to the widget."
]
},
{

2
examples/Interactive Widgets/Widget Basics.ipynb
Unescape View File

@ -374,7 +374,7 @@
},
"outputs": [],
"source": [
"from IPython.utils.traitlets import link\n",
"from traitlets import link\n",
"a = FloatText()\n",
"b = FloatSlider()\n",
"c = FloatProgress()\n",

2
examples/Interactive Widgets/Widget Events.ipynb
Unescape View File

@ -228,7 +228,7 @@
},
"outputs": [],
"source": [
"from IPython.utils import traitlets"
"import traitlets"
]
},
{

2
examples/Notebook/Using nbconvert as a Library.ipynb
Unescape View File

@ -444,7 +444,7 @@
},
"outputs": [],
"source": [
"from IPython.utils.traitlets import Integer"
"from traitlets import Integer"
]
},
{

4
jupyter_notebook/__init__.py
Unescape View File

@ -1,4 +1,4 @@
"""The IPython HTML Notebook"""
"""The Jupyter HTML Notebook"""
import os
# Packagers: modify this line if you store the notebook static files elsewhere
@ -7,7 +7,7 @@ DEFAULT_STATIC_FILES_PATH = os.path.join(os.path.dirname(__file__), "static")
# Packagers: modify the next line if you store the notebook template files
# elsewhere
# Include both IPython/html/ and IPython/html/templates/. This makes it
# Include both jupyter_notebook/ and jupyter_notebook/templates/. This makes it
# possible for users to override a template with a file that inherits from that
# template.
#

2
jupyter_notebook/auth/login.py
Unescape View File

@ -1,6 +1,6 @@
"""Tornado handlers for logging into the notebook."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import uuid

25
jupyter_notebook/auth/logout.py
Unescape View File

@ -1,27 +1,11 @@
"""Tornado handlers for logging out of the notebook.
Authors:
* Brian Granger
"""
#-----------------------------------------------------------------------------
# Copyright (C) 2011 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from ..base.handlers import IPythonHandler
#-----------------------------------------------------------------------------
# Handler
#-----------------------------------------------------------------------------
class LogoutHandler(IPythonHandler):
@ -36,9 +20,4 @@ class LogoutHandler(IPythonHandler):
message=message))
#-----------------------------------------------------------------------------
# URL to handler mappings
#-----------------------------------------------------------------------------
default_handlers = [(r"/logout", LogoutHandler)]

16
jupyter_notebook/base/handlers.py
Unescape View File

@ -1,11 +1,10 @@
"""Base Tornado handlers for the notebook server."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import functools
import json
import logging
import os
import re
import sys
@ -22,15 +21,14 @@ from tornado import web
from tornado import gen
from tornado.log import app_log
import IPython
from IPython.utils.sysinfo import get_sys_info
from IPython.config import Application
from IPython.utils.path import filefind
from IPython.utils.py3compat import string_types
from jupyter_notebook.utils import is_hidden, url_path_join, url_escape
from traitlets.config import Application
from ipython_genutils.path import filefind
from ipython_genutils.py3compat import string_types
import jupyter_notebook
from jupyter_notebook.utils import is_hidden, url_path_join, url_escape
from jupyter_notebook.services.security import csp_report_uri
#-----------------------------------------------------------------------------
@ -458,7 +456,7 @@ class ApiVersionHandler(IPythonHandler):
@json_errors
def get(self):
# not authenticated, so give as few info as possible
self.finish(json.dumps({"version":IPython.__version__}))
self.finish(json.dumps({"version":jupyter_notebook.__version__}))
class TrailingSlashHandler(web.RequestHandler):

6
jupyter_notebook/base/zmqhandlers.py
Unescape View File

@ -1,7 +1,7 @@
# coding: utf-8
"""Tornado handlers for WebSocket <-> ZMQ sockets."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import os
@ -19,9 +19,9 @@ import tornado
from tornado import gen, ioloop, web
from tornado.websocket import WebSocketHandler
from IPython.kernel.zmq.session import Session
from jupyter_client.session import Session
from jupyter_client.jsonutil import date_default, extract_dates
from IPython.utils.py3compat import cast_unicode
from ipython_genutils.py3compat import cast_unicode
from .handlers import IPythonHandler

2
jupyter_notebook/edit/handlers.py
Unescape View File

@ -1,7 +1,7 @@
#encoding: utf-8
"""Tornado handlers for the terminal emulator."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from tornado import web

2
jupyter_notebook/files/handlers.py
Unescape View File

@ -1,6 +1,6 @@
"""Serve files directly from the ContentsManager."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import os

2
jupyter_notebook/log.py
Unescape View File

@ -1,5 +1,5 @@
#-----------------------------------------------------------------------------
# Copyright (C) 2013 The IPython Development Team
# Copyright (c) Jupyter Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.

10
jupyter_notebook/nbconvert/handlers.py
Unescape View File

@ -1,6 +1,6 @@
"""Tornado handlers for nbconvert."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import io
@ -13,10 +13,10 @@ from ..base.handlers import (
IPythonHandler, FilesRedirectHandler,
path_regex,
)
from IPython.nbformat import from_dict
from jupyter_nbformat import from_dict
from IPython.utils.py3compat import cast_bytes
from IPython.utils import text
from ipython_genutils.py3compat import cast_bytes
from ipython_genutils import text
def find_resource_files(output_files_dir):
files = []
@ -57,7 +57,7 @@ def get_exporter(format, **kwargs):
"""get an exporter, raising appropriate errors"""
# if this fails, will raise 500
try:
from IPython.nbconvert.exporters.export import exporter_map
from jupyter_nbconvert.exporters.export import exporter_map
except ImportError as e:
raise web.HTTPError(500, "Could not import nbconvert: %s" % e)

6
jupyter_notebook/nbconvert/tests/test_nbconvert_handlers.py
Unescape View File

@ -10,12 +10,12 @@ import requests
from jupyter_notebook.utils import url_path_join
from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
from IPython.nbformat import write
from IPython.nbformat.v4 import (
from jupyter_nbformat import write
from jupyter_nbformat.v4 import (
new_notebook, new_markdown_cell, new_code_cell, new_output,
)
from IPython.testing.decorators import onlyif_cmds_exist
from ipython_genutils.testing.decorators import onlyif_cmds_exist
class NbconvertAPI(object):

11
jupyter_notebook/nbextensions.py
Unescape View File

@ -1,7 +1,7 @@
# coding: utf-8
"""Utilities for installing Javascript extensions for the notebook"""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from __future__ import print_function
@ -22,9 +22,10 @@ except ImportError:
from urlparse import urlparse
from urllib import urlretrieve
from IPython.utils.path import get_ipython_dir, ensure_dir_exists
from IPython.utils.py3compat import string_types, cast_unicode_py2
from IPython.utils.tempdir import TemporaryDirectory
from IPython.paths import get_ipython_dir
from ipython_genutils.path import ensure_dir_exists
from ipython_genutils.py3compat import string_types, cast_unicode_py2
from ipython_genutils.tempdir import TemporaryDirectory
class ArgumentConflict(ValueError):
pass
@ -246,7 +247,7 @@ def install_nbextension(path, overwrite=False, symlink=False, user=False, prefix
# install nbextension app
#----------------------------------------------------------------------
from IPython.utils.traitlets import Bool, Enum, Unicode, TraitError
from traitlets import Bool, Enum, Unicode, TraitError
from IPython.core.application import BaseIPythonApplication
flags = {

2
jupyter_notebook/notebook/handlers.py
Unescape View File

@ -1,6 +1,6 @@
"""Tornado handlers for the live notebook view."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import os

27
jupyter_notebook/notebookapp.py
Unescape View File

@ -1,7 +1,7 @@
# coding: utf-8
"""A tornado based IPython notebook server."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from __future__ import print_function
@ -66,24 +66,25 @@ from .auth.login import LoginHandler
from .auth.logout import LogoutHandler
from .base.handlers import IPythonHandler, FileFindHandler
from IPython.config import Config
from IPython.config.application import catch_config_error, boolean_flag
from traitlets.config import Config
from traitlets.config.application import catch_config_error, boolean_flag
from IPython.core.application import (
BaseIPythonApplication, base_flags, base_aliases,
)
from IPython.core.profiledir import ProfileDir
from IPython.kernel import KernelManager
from IPython.kernel.kernelspec import KernelSpecManager, NoSuchKernel, NATIVE_KERNEL_NAME
from IPython.kernel.zmq.session import Session
from IPython.nbformat.sign import NotebookNotary
from IPython.utils.importstring import import_item
from IPython.utils import submodule
from IPython.utils.traitlets import (
from jupyter_client import KernelManager
from jupyter_client.kernelspec import KernelSpecManager, NoSuchKernel, NATIVE_KERNEL_NAME
from jupyter_client.session import Session
from jupyter_nbformat.sign import NotebookNotary
from ipython_genutils.importstring import import_item
from . import submodule
from traitlets import (
Dict, Unicode, Integer, List, Bool, Bytes, Instance,
TraitError, Type,
)
from IPython.utils import py3compat
from IPython.utils.path import filefind, get_ipython_dir
from ipython_genutils import py3compat
from IPython.paths import get_ipython_dir
from ipython_genutils.path import filefind
from IPython.utils.sysinfo import get_sys_info
from .nbextensions import SYSTEM_NBEXTENSIONS_DIRS
@ -674,7 +675,7 @@ class NotebookApp(BaseIPythonApplication):
config=True,
help="""
The kernel spec manager class to use. Should be a subclass
of `IPython.kernel.kernelspec.KernelSpecManager`.
of `jupyter_client.kernelspec.KernelSpecManager`.
The Api of KernelSpecManager is provisional and might change
without warning between this version of IPython and the next stable one.

14
jupyter_notebook/services/clusters/clustermanager.py
Unescape View File

@ -1,16 +1,16 @@
"""Manage IPython.parallel clusters in the notebook."""
"""Manage ipython_parallel clusters in the notebook."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from tornado import web
from IPython.config.configurable import LoggingConfigurable
from IPython.utils.traitlets import Dict, Instance, Float
from traitlets.config.configurable import LoggingConfigurable
from traitlets import Dict, Instance, Float
from IPython.core.profileapp import list_profiles_in
from IPython.core.profiledir import ProfileDir
from IPython.utils import py3compat
from IPython.utils.path import get_ipython_dir
from ipython_genutils import py3compat
from IPython.paths import get_ipython_dir
class ClusterManager(LoggingConfigurable):
@ -26,7 +26,7 @@ class ClusterManager(LoggingConfigurable):
return IOLoop.instance()
def build_launchers(self, profile_dir):
from IPython.parallel.apps.ipclusterapp import IPClusterStart
from ipython_parallel.apps.ipclusterapp import IPClusterStart
class DummyIPClusterStart(IPClusterStart):
"""Dummy subclass to skip init steps that conflict with global app.

2
jupyter_notebook/services/clusters/handlers.py
Unescape View File

@ -1,6 +1,6 @@
"""Tornado handlers for cluster web service."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import json

4
jupyter_notebook/services/config/handlers.py
Unescape View File

@ -1,6 +1,6 @@
"""Tornado handlers for frontend config storage."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import json
import os
@ -8,7 +8,7 @@ import io
import errno
from tornado import web
from IPython.utils.py3compat import PY3
from ipython_genutils.py3compat import PY3
from ...base.handlers import IPythonHandler, json_errors
class ConfigHandler(IPythonHandler):

6
jupyter_notebook/services/config/manager.py
Unescape View File

@ -1,11 +1,11 @@
"""Manager to read and modify frontend config data in JSON files.
"""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from IPython.config.manager import BaseJSONConfigManager
from traitlets.config.manager import BaseJSONConfigManager
from IPython.utils.path import locate_profile
from IPython.utils.traitlets import Unicode
from traitlets import Unicode
class ConfigManager(BaseJSONConfigManager):
"""Config Manager used for storing notebook frontend config"""

4
jupyter_notebook/services/contents/checkpoints.py
Unescape View File

@ -2,12 +2,12 @@
Classes for managing Checkpoints.
"""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from tornado.web import HTTPError
from IPython.config.configurable import LoggingConfigurable
from traitlets.config.configurable import LoggingConfigurable
class Checkpoints(LoggingConfigurable):

6
jupyter_notebook/services/contents/filecheckpoints.py
Unescape View File

@ -13,9 +13,9 @@ from .checkpoints import (
from .fileio import FileManagerMixin
from IPython.utils import tz
from IPython.utils.path import ensure_dir_exists
from IPython.utils.py3compat import getcwd
from IPython.utils.traitlets import Unicode
from ipython_genutils.path import ensure_dir_exists
from ipython_genutils.py3compat import getcwd
from traitlets import Unicode
class FileCheckpoints(FileManagerMixin, Checkpoints):

4
jupyter_notebook/services/contents/fileio.py
Unescape View File

@ -2,7 +2,7 @@
Utilities for file-based Contents/Checkpoints managers.
"""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import base64
@ -20,7 +20,7 @@ from jupyter_notebook.utils import (
to_os_path,
)
from IPython import nbformat
from IPython.utils.py3compat import str_to_unicode
from ipython_genutils.py3compat import str_to_unicode
def _copy_metadata(src, dst):

10
jupyter_notebook/services/contents/filemanager.py
Unescape View File

@ -1,6 +1,6 @@
"""A contents manager that uses the local file system for storage."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
@ -16,9 +16,9 @@ from .fileio import FileManagerMixin
from .manager import ContentsManager
from IPython import nbformat
from IPython.utils.importstring import import_item
from IPython.utils.traitlets import Any, Unicode, Bool, TraitError
from IPython.utils.py3compat import getcwd, string_types
from ipython_genutils.importstring import import_item
from traitlets import Any, Unicode, Bool, TraitError
from ipython_genutils.py3compat import getcwd, string_types
from IPython.utils import tz
from jupyter_notebook.utils import (
is_hidden,
@ -33,7 +33,7 @@ def _post_save_script(model, os_path, contents_manager, **kwargs):
replaces `ipython notebook --script`
"""
from IPython.nbconvert.exporters.script import ScriptExporter
from jupyter_nbconvert.exporters.script import ScriptExporter
if model['type'] != 'notebook':
return

2
jupyter_notebook/services/contents/handlers.py
Unescape View File

@ -1,6 +1,6 @@
"""Tornado handlers for the contents web service."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import json

14
jupyter_notebook/services/contents/manager.py
Unescape View File

@ -1,6 +1,6 @@
"""A base class for contents managers."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from fnmatch import fnmatch
@ -12,11 +12,11 @@ import re
from tornado.web import HTTPError
from .checkpoints import Checkpoints
from IPython.config.configurable import LoggingConfigurable
from IPython.nbformat import sign, validate, ValidationError
from IPython.nbformat.v4 import new_notebook
from IPython.utils.importstring import import_item
from IPython.utils.traitlets import (
from traitlets.config.configurable import LoggingConfigurable
from jupyter_nbformat import sign, validate, ValidationError
from jupyter_nbformat.v4 import new_notebook
from ipython_genutils.importstring import import_item
from traitlets import (
Any,
Dict,
Instance,
@ -25,7 +25,7 @@ from IPython.utils.traitlets import (
Type,
Unicode,
)
from IPython.utils.py3compat import string_types
from ipython_genutils.py3compat import string_types
copy_pat = re.compile(r'\-Copy\d*\.')

12
jupyter_notebook/services/contents/tests/test_contents_api.py
Unescape View File

@ -15,16 +15,16 @@ import requests
from ..filecheckpoints import GenericFileCheckpoints
from IPython.config import Config
from traitlets.config import Config
from jupyter_notebook.utils import url_path_join, url_escape, to_os_path
from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
from IPython.nbformat import read, write, from_dict
from IPython.nbformat.v4 import (
from jupyter_nbformat import read, write, from_dict
from jupyter_nbformat.v4 import (
new_notebook, new_markdown_cell,
)
from IPython.nbformat import v2
from IPython.utils import py3compat
from IPython.utils.tempdir import TemporaryDirectory
from jupyter_nbformat import v2
from ipython_genutils import py3compat
from ipython_genutils.tempdir import TemporaryDirectory
def uniq_stable(elems):
"""uniq_stable(elems) -> list

6
jupyter_notebook/services/contents/tests/test_fileio.py
Unescape View File

@ -1,7 +1,7 @@
# encoding: utf-8
"""Tests for file IO"""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import io as stdlib_io
@ -10,10 +10,10 @@ import stat
import nose.tools as nt
from IPython.testing.decorators import skip_win32
from ipython_genutils.testing.decorators import skip_win32
from ..fileio import atomic_writing
from IPython.utils.tempdir import TemporaryDirectory
from ipython_genutils.tempdir import TemporaryDirectory
umask = 0

8
jupyter_notebook/services/contents/tests/test_manager.py
Unescape View File

@ -12,11 +12,11 @@ from tornado.web import HTTPError
from unittest import TestCase
from tempfile import NamedTemporaryFile
from IPython.nbformat import v4 as nbformat
from jupyter_nbformat import v4 as nbformat
from IPython.utils.tempdir import TemporaryDirectory
from IPython.utils.traitlets import TraitError
from IPython.testing import decorators as dec
from ipython_genutils.tempdir import TemporaryDirectory
from traitlets import TraitError
from ipython_genutils.testing import decorators as dec
from ..filemanager import FileContentsManager

10
jupyter_notebook/services/kernels/handlers.py
Unescape View File

@ -1,6 +1,6 @@
"""Tornado handlers for kernels."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import json
@ -10,13 +10,13 @@ from tornado.concurrent import Future
from tornado.ioloop import IOLoop
from jupyter_client.jsonutil import date_default
from IPython.utils.py3compat import cast_unicode
from ipython_genutils.py3compat import cast_unicode
from jupyter_notebook.utils import url_path_join, url_escape
from ...base.handlers import IPythonHandler, json_errors
from ...base.zmqhandlers import AuthenticatedZMQStreamHandler, deserialize_binary_message
from IPython.core.release import kernel_protocol_version
from jupyter_client import protocol_version as client_protocol_version
class MainKernelHandler(IPythonHandler):
@ -157,8 +157,8 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
Set up protocol adaptation, if needed,
and signal that connection can continue.
"""
protocol_version = info.get('protocol_version', kernel_protocol_version)
if protocol_version != kernel_protocol_version:
protocol_version = info.get('protocol_version', client_protocol_version)
if protocol_version != client_protocol_version:
self.session.adapt_version = int(protocol_version.split('.')[0])
self.log.info("Adapting to protocol v%s for kernel %s", protocol_version, self.kernel_id)
if not self._kernel_info_future.done():

10
jupyter_notebook/services/kernels/kernelmanager.py
Unescape View File

@ -4,25 +4,25 @@
- creates REST API models
"""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import os
from tornado import web
from IPython.kernel.multikernelmanager import MultiKernelManager
from IPython.utils.traitlets import List, Unicode, TraitError
from jupyter_client.multikernelmanager import MultiKernelManager
from traitlets import List, Unicode, TraitError
from jupyter_notebook.utils import to_os_path
from IPython.utils.py3compat import getcwd
from ipython_genutils.py3compat import getcwd
class MappingKernelManager(MultiKernelManager):
"""A KernelManager that handles notebook mapping and HTTP error handling"""
def _kernel_manager_class_default(self):
return "IPython.kernel.ioloop.IOLoopKernelManager"
return "jupyter_client.ioloop.IOLoopKernelManager"
kernel_argv = List(Unicode)

2
jupyter_notebook/services/kernelspecs/handlers.py
Unescape View File

@ -1,6 +1,6 @@
"""Tornado handlers for kernel specifications."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import glob

4
jupyter_notebook/services/kernelspecs/tests/test_kernelspecs_api.py
Unescape View File

@ -11,11 +11,11 @@ pjoin = os.path.join
import requests
from IPython.kernel.kernelspec import NATIVE_KERNEL_NAME
from jupyter_client.kernelspec import NATIVE_KERNEL_NAME
from jupyter_notebook.utils import url_path_join
from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
# Copied from IPython.kernel.tests.test_kernelspec so updating that doesn't
# Copied from jupyter_client.tests.test_kernelspec so updating that doesn't
# break these tests
sample_kernel_json = {'argv':['cat', '{connection_file}'],
'display_name':'Test kernel',

2
jupyter_notebook/services/nbconvert/handlers.py
Unescape View File

@ -11,7 +11,7 @@ class NbconvertRootHandler(IPythonHandler):
@json_errors
def get(self):
try:
from IPython.nbconvert.exporters.export import exporter_map
from jupyter_nbconvert.exporters.export import exporter_map
except ImportError as e:
raise web.HTTPError(500, "Could not import nbconvert: %s" % e)
res = {}

2
jupyter_notebook/services/security/handlers.py
Unescape View File

@ -1,6 +1,6 @@
"""Tornado handlers for security logging."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from tornado import gen, web

4
jupyter_notebook/services/sessions/handlers.py
Unescape View File

@ -1,6 +1,6 @@
"""Tornado handlers for the sessions web service."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import json
@ -10,7 +10,7 @@ from tornado import web
from ...base.handlers import IPythonHandler, json_errors
from jupyter_client.jsonutil import date_default
from jupyter_notebook.utils import url_path_join, url_escape
from IPython.kernel.kernelspec import NoSuchKernel
from jupyter_client.kernelspec import NoSuchKernel
class SessionRootHandler(IPythonHandler):

8
jupyter_notebook/services/sessions/sessionmanager.py
Unescape View File

@ -1,6 +1,6 @@
"""A base class session manager."""
# Copyright (c) IPython Development Team.
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import uuid
@ -8,9 +8,9 @@ import sqlite3
from tornado import web
from IPython.config.configurable import LoggingConfigurable
from IPython.utils.py3compat import unicode_type
from IPython.utils.traitlets import Instance
from traitlets.config.configurable import LoggingConfigurable
from ipython_genutils.py3compat import unicode_type
from traitlets import Instance
class SessionManager(LoggingConfigurable):

4
jupyter_notebook/services/sessions/tests/test_sessions_api.py
Unescape View File

@ -12,8 +12,8 @@ pjoin = os.path.join
from jupyter_notebook.utils import url_path_join
from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
from IPython.nbformat.v4 import new_notebook
from IPython.nbformat import write
from jupyter_nbformat.v4 import new_notebook
from jupyter_nbformat import write
class SessionAPI(object):
"""Wrapper for notebook API calls."""

2
jupyter_notebook/static/auth/js/loginmain.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
var ipython = ipython || {};

2
jupyter_notebook/static/auth/js/loginwidget.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/auth/js/logoutmain.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
var ipython = ipython || {};

2
jupyter_notebook/static/base/js/dialog.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define(function(require) {

2
jupyter_notebook/static/base/js/events.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
// Give us an object to bind all events to. This object should be created

2
jupyter_notebook/static/base/js/keyboard.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
/**
*

2
jupyter_notebook/static/base/js/namespace.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
var IPython = IPython || {};

2
jupyter_notebook/static/base/js/notificationarea.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/base/js/notificationwidget.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/base/js/page.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/base/js/security.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/base/js/utils.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/base/less/page.less
Unescape View File

@ -1,7 +1,7 @@
/**
* Primary styles
*
* Author: IPython Development Team
* Author: Jupyter Development Team
*/

2
jupyter_notebook/static/edit/js/editor.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/edit/js/main.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
require([

2
jupyter_notebook/static/edit/js/menubar.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/edit/js/savewidget.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/about.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
require([
'jquery',

2
jupyter_notebook/static/notebook/js/actions.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define(function(require){

2
jupyter_notebook/static/notebook/js/cell.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
/**

2
jupyter_notebook/static/notebook/js/celltoolbar.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/celltoolbarpresets/default.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/celltoolbarpresets/example.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
// Example Use for the CellToolbar library

2
jupyter_notebook/static/notebook/js/celltoolbarpresets/rawcell.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/celltoolbarpresets/slideshow.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/codecell.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
/**
*

2
jupyter_notebook/static/notebook/js/completer.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/contexthint.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
// highly adapted for codemiror jshint

2
jupyter_notebook/static/notebook/js/kernelselector.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/keyboardmanager.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
/**
*

2
jupyter_notebook/static/notebook/js/main.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
require([

2
jupyter_notebook/static/notebook/js/maintoolbar.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/mathjaxutils.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/menubar.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/notebook.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
/**

2
jupyter_notebook/static/notebook/js/outputarea.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/pager.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/quickhelp.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/savewidget.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/scrollmanager.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define(['jquery'], function($){
"use strict";

2
jupyter_notebook/static/notebook/js/textcell.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/toolbar.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/tooltip.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/js/tour.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/notebook/less/tooltip.less
Unescape View File

@ -1,7 +1,7 @@
/**
* Primary styles
*
* Author: IPython Development Team
* Author: Jupyter Development Team
*/
/** WARNING IF YOU ARE EDITTING THIS FILE, if this is a .css file, It has a lot

2
jupyter_notebook/static/services/config.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/services/contents.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define(function(require) {

2
jupyter_notebook/static/services/kernels/comm.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/services/kernels/kernel.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/services/kernels/serialize.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/services/sessions/session.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

6
jupyter_notebook/static/style/style.min.css vendored
Unescape View File

@ -8383,7 +8383,7 @@ div.traceback-wrapper {
/**
* Primary styles
*
* Author: IPython Development Team
* Author: Jupyter Development Team
*/
body {
background-color: #ffffff;
@ -8627,7 +8627,7 @@ span#login_widget > .button .badge,
/**
* Primary styles
*
* Author: IPython Development Team
* Author: Jupyter Development Team
*/
ul#tabs {
margin-bottom: 4px;
@ -11293,7 +11293,7 @@ span.autosave_status {
/**
* Primary styles
*
* Author: IPython Development Team
* Author: Jupyter Development Team
*/
/** WARNING IF YOU ARE EDITTING THIS FILE, if this is a .css file, It has a lot
* of chance of beeing generated from the ../less/[samename].less file, you can

2
jupyter_notebook/static/terminal/js/main.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
require([

2
jupyter_notebook/static/tree/js/clusterlist.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/tree/js/kernellist.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
define([

2
jupyter_notebook/static/tree/js/main.js
Unescape View File

@ -1,4 +1,4 @@
// Copyright (c) IPython Development Team.
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
require([

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save