From d2f34467701aef60452293ad78a3772baec7f4cc Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 10 Apr 2015 14:20:06 -0700 Subject: [PATCH] update dependency imports removing IPython shims --- IPython/testing/iptest.py | 4 +-- IPython/testing/iptestcontroller.py | 8 +++--- .../Custom Widget - Hello World.ipynb | 6 ++--- .../Date Picker Widget.ipynb | 2 +- .../Export As (nbconvert).ipynb | 2 +- .../File Upload Widget.ipynb | 2 +- .../Interactive Widgets/Widget Basics.ipynb | 2 +- .../Interactive Widgets/Widget Events.ipynb | 2 +- .../Using nbconvert as a Library.ipynb | 2 +- jupyter_notebook/__init__.py | 4 +-- jupyter_notebook/auth/login.py | 2 +- jupyter_notebook/auth/logout.py | 25 ++--------------- jupyter_notebook/base/handlers.py | 16 +++++------ jupyter_notebook/base/zmqhandlers.py | 6 ++--- jupyter_notebook/edit/handlers.py | 2 +- jupyter_notebook/files/handlers.py | 2 +- jupyter_notebook/log.py | 2 +- jupyter_notebook/nbconvert/handlers.py | 10 +++---- .../tests/test_nbconvert_handlers.py | 6 ++--- jupyter_notebook/nbextensions.py | 11 ++++---- jupyter_notebook/notebook/handlers.py | 2 +- jupyter_notebook/notebookapp.py | 27 ++++++++++--------- .../services/clusters/clustermanager.py | 14 +++++----- .../services/clusters/handlers.py | 2 +- jupyter_notebook/services/config/handlers.py | 4 +-- jupyter_notebook/services/config/manager.py | 6 ++--- .../services/contents/checkpoints.py | 4 +-- .../services/contents/filecheckpoints.py | 6 ++--- jupyter_notebook/services/contents/fileio.py | 4 +-- .../services/contents/filemanager.py | 10 +++---- .../services/contents/handlers.py | 2 +- jupyter_notebook/services/contents/manager.py | 14 +++++----- .../contents/tests/test_contents_api.py | 12 ++++----- .../services/contents/tests/test_fileio.py | 6 ++--- .../services/contents/tests/test_manager.py | 8 +++--- jupyter_notebook/services/kernels/handlers.py | 10 +++---- .../services/kernels/kernelmanager.py | 10 +++---- .../services/kernelspecs/handlers.py | 2 +- .../kernelspecs/tests/test_kernelspecs_api.py | 4 +-- .../services/nbconvert/handlers.py | 2 +- .../services/security/handlers.py | 2 +- .../services/sessions/handlers.py | 4 +-- .../services/sessions/sessionmanager.py | 8 +++--- .../sessions/tests/test_sessions_api.py | 4 +-- jupyter_notebook/static/auth/js/loginmain.js | 2 +- .../static/auth/js/loginwidget.js | 2 +- jupyter_notebook/static/auth/js/logoutmain.js | 2 +- jupyter_notebook/static/base/js/dialog.js | 2 +- jupyter_notebook/static/base/js/events.js | 2 +- jupyter_notebook/static/base/js/keyboard.js | 2 +- jupyter_notebook/static/base/js/namespace.js | 2 +- .../static/base/js/notificationarea.js | 2 +- .../static/base/js/notificationwidget.js | 2 +- jupyter_notebook/static/base/js/page.js | 2 +- jupyter_notebook/static/base/js/security.js | 2 +- jupyter_notebook/static/base/js/utils.js | 2 +- jupyter_notebook/static/base/less/page.less | 2 +- jupyter_notebook/static/edit/js/editor.js | 2 +- jupyter_notebook/static/edit/js/main.js | 2 +- jupyter_notebook/static/edit/js/menubar.js | 2 +- jupyter_notebook/static/edit/js/savewidget.js | 2 +- jupyter_notebook/static/notebook/js/about.js | 2 +- .../static/notebook/js/actions.js | 2 +- jupyter_notebook/static/notebook/js/cell.js | 2 +- .../static/notebook/js/celltoolbar.js | 2 +- .../notebook/js/celltoolbarpresets/default.js | 2 +- .../notebook/js/celltoolbarpresets/example.js | 2 +- .../notebook/js/celltoolbarpresets/rawcell.js | 2 +- .../js/celltoolbarpresets/slideshow.js | 2 +- .../static/notebook/js/codecell.js | 2 +- .../static/notebook/js/completer.js | 2 +- .../static/notebook/js/contexthint.js | 2 +- .../static/notebook/js/kernelselector.js | 2 +- .../static/notebook/js/keyboardmanager.js | 2 +- jupyter_notebook/static/notebook/js/main.js | 2 +- .../static/notebook/js/maintoolbar.js | 2 +- .../static/notebook/js/mathjaxutils.js | 2 +- .../static/notebook/js/menubar.js | 2 +- .../static/notebook/js/notebook.js | 2 +- .../static/notebook/js/outputarea.js | 2 +- jupyter_notebook/static/notebook/js/pager.js | 2 +- .../static/notebook/js/quickhelp.js | 2 +- .../static/notebook/js/savewidget.js | 2 +- .../static/notebook/js/scrollmanager.js | 2 +- .../static/notebook/js/textcell.js | 2 +- .../static/notebook/js/toolbar.js | 2 +- .../static/notebook/js/tooltip.js | 2 +- jupyter_notebook/static/notebook/js/tour.js | 2 +- .../static/notebook/less/tooltip.less | 2 +- jupyter_notebook/static/services/config.js | 2 +- jupyter_notebook/static/services/contents.js | 2 +- .../static/services/kernels/comm.js | 2 +- .../static/services/kernels/kernel.js | 2 +- .../static/services/kernels/serialize.js | 2 +- .../static/services/sessions/session.js | 2 +- jupyter_notebook/static/style/style.min.css | 6 ++--- jupyter_notebook/static/terminal/js/main.js | 2 +- .../static/tree/js/clusterlist.js | 2 +- jupyter_notebook/static/tree/js/kernellist.js | 2 +- jupyter_notebook/static/tree/js/main.js | 2 +- .../static/tree/js/newnotebook.js | 2 +- .../static/tree/js/notebooklist.js | 2 +- .../static/tree/js/sessionlist.js | 2 +- .../static/tree/js/terminallist.js | 2 +- jupyter_notebook/static/tree/less/tree.less | 2 +- jupyter_notebook/static/widgets/js/init.js | 2 +- jupyter_notebook/static/widgets/js/manager.js | 2 +- jupyter_notebook/static/widgets/js/widget.js | 2 +- .../static/widgets/js/widget_bool.js | 2 +- .../static/widgets/js/widget_box.js | 2 +- .../static/widgets/js/widget_button.js | 2 +- .../static/widgets/js/widget_float.js | 2 +- .../static/widgets/js/widget_image.js | 2 +- .../static/widgets/js/widget_int.js | 2 +- .../static/widgets/js/widget_link.js | 2 +- .../static/widgets/js/widget_output.js | 2 +- .../static/widgets/js/widget_selection.js | 2 +- .../widgets/js/widget_selectioncontainer.js | 2 +- .../static/widgets/js/widget_string.js | 2 +- jupyter_notebook/terminal/handlers.py | 2 +- jupyter_notebook/tests/launchnotebook.py | 2 +- jupyter_notebook/tests/test_files.py | 6 ++--- jupyter_notebook/tests/test_nbextensions.py | 8 +++--- jupyter_notebook/tests/test_notebookapp.py | 4 +-- jupyter_notebook/tests/test_serialize.py | 2 +- jupyter_notebook/tests/test_utils.py | 2 +- jupyter_notebook/tests/widgets/widget.js | 4 +-- jupyter_notebook/tree/handlers.py | 2 +- .../tree/tests/test_tree_handler.py | 4 +-- jupyter_notebook/utils.py | 6 ++--- jupyter_notebook/widgets/deprecated.py | 2 +- jupyter_notebook/widgets/interaction.py | 6 ++--- .../widgets/tests/test_interaction.py | 6 ++--- jupyter_notebook/widgets/tests/test_link.py | 2 +- jupyter_notebook/widgets/tests/test_traits.py | 4 +-- jupyter_notebook/widgets/trait_types.py | 4 +-- jupyter_notebook/widgets/widget.py | 27 +++++++------------ jupyter_notebook/widgets/widget_bool.py | 4 +-- jupyter_notebook/widgets/widget_box.py | 4 +-- jupyter_notebook/widgets/widget_button.py | 4 +-- jupyter_notebook/widgets/widget_float.py | 4 +-- jupyter_notebook/widgets/widget_image.py | 4 +-- jupyter_notebook/widgets/widget_int.py | 4 +-- jupyter_notebook/widgets/widget_link.py | 6 ++--- jupyter_notebook/widgets/widget_output.py | 6 ++--- jupyter_notebook/widgets/widget_selection.py | 6 ++--- .../widgets/widget_selectioncontainer.py | 4 +-- jupyter_notebook/widgets/widget_string.py | 4 +-- 148 files changed, 275 insertions(+), 305 deletions(-) diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index 094e92860..c1aeaf231 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -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 diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py index 5a3bb73d2..35bc5a51a 100644 --- a/IPython/testing/iptestcontroller.py +++ b/IPython/testing/iptestcontroller.py @@ -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, diff --git a/examples/Interactive Widgets/Custom Widget - Hello World.ipynb b/examples/Interactive Widgets/Custom Widget - Hello World.ipynb index be7937bb7..1cf412d40 100644 --- a/examples/Interactive Widgets/Custom Widget - Hello World.ipynb +++ b/examples/Interactive Widgets/Custom Widget - Hello World.ipynb @@ -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'))" ] }, diff --git a/examples/Interactive Widgets/Date Picker Widget.ipynb b/examples/Interactive Widgets/Date Picker Widget.ipynb index e135653a0..df8ca102d 100644 --- a/examples/Interactive Widgets/Date Picker Widget.ipynb +++ b/examples/Interactive Widgets/Date Picker Widget.ipynb @@ -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" ] }, { diff --git a/examples/Interactive Widgets/Export As (nbconvert).ipynb b/examples/Interactive Widgets/Export As (nbconvert).ipynb index 57a6cb511..7bd8b8966 100644 --- a/examples/Interactive Widgets/Export As (nbconvert).ipynb +++ b/examples/Interactive Widgets/Export As (nbconvert).ipynb @@ -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", diff --git a/examples/Interactive Widgets/File Upload Widget.ipynb b/examples/Interactive Widgets/File Upload Widget.ipynb index 423019a6e..29a0d2903 100644 --- a/examples/Interactive Widgets/File Upload Widget.ipynb +++ b/examples/Interactive Widgets/File Upload Widget.ipynb @@ -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." ] }, { diff --git a/examples/Interactive Widgets/Widget Basics.ipynb b/examples/Interactive Widgets/Widget Basics.ipynb index 0c10bf317..2f3579f46 100644 --- a/examples/Interactive Widgets/Widget Basics.ipynb +++ b/examples/Interactive Widgets/Widget Basics.ipynb @@ -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", diff --git a/examples/Interactive Widgets/Widget Events.ipynb b/examples/Interactive Widgets/Widget Events.ipynb index 61e908d81..02787fd11 100644 --- a/examples/Interactive Widgets/Widget Events.ipynb +++ b/examples/Interactive Widgets/Widget Events.ipynb @@ -228,7 +228,7 @@ }, "outputs": [], "source": [ - "from IPython.utils import traitlets" + "import traitlets" ] }, { diff --git a/examples/Notebook/Using nbconvert as a Library.ipynb b/examples/Notebook/Using nbconvert as a Library.ipynb index e93ab8459..e10c26660 100644 --- a/examples/Notebook/Using nbconvert as a Library.ipynb +++ b/examples/Notebook/Using nbconvert as a Library.ipynb @@ -444,7 +444,7 @@ }, "outputs": [], "source": [ - "from IPython.utils.traitlets import Integer" + "from traitlets import Integer" ] }, { diff --git a/jupyter_notebook/__init__.py b/jupyter_notebook/__init__.py index f70269068..25a46823d 100644 --- a/jupyter_notebook/__init__.py +++ b/jupyter_notebook/__init__.py @@ -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. # diff --git a/jupyter_notebook/auth/login.py b/jupyter_notebook/auth/login.py index fa3b6ba9a..6c52486bf 100644 --- a/jupyter_notebook/auth/login.py +++ b/jupyter_notebook/auth/login.py @@ -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 diff --git a/jupyter_notebook/auth/logout.py b/jupyter_notebook/auth/logout.py index 43a1326d8..9eaee1f47 100644 --- a/jupyter_notebook/auth/logout.py +++ b/jupyter_notebook/auth/logout.py @@ -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)] \ No newline at end of file diff --git a/jupyter_notebook/base/handlers.py b/jupyter_notebook/base/handlers.py index f77fde4f6..fb5688aa8 100644 --- a/jupyter_notebook/base/handlers.py +++ b/jupyter_notebook/base/handlers.py @@ -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): diff --git a/jupyter_notebook/base/zmqhandlers.py b/jupyter_notebook/base/zmqhandlers.py index e8405cadc..6c7717d66 100644 --- a/jupyter_notebook/base/zmqhandlers.py +++ b/jupyter_notebook/base/zmqhandlers.py @@ -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 diff --git a/jupyter_notebook/edit/handlers.py b/jupyter_notebook/edit/handlers.py index 521bd2cfd..c0864ab5e 100644 --- a/jupyter_notebook/edit/handlers.py +++ b/jupyter_notebook/edit/handlers.py @@ -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 diff --git a/jupyter_notebook/files/handlers.py b/jupyter_notebook/files/handlers.py index 624644207..a0af02c20 100644 --- a/jupyter_notebook/files/handlers.py +++ b/jupyter_notebook/files/handlers.py @@ -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 diff --git a/jupyter_notebook/log.py b/jupyter_notebook/log.py index b7dca03ab..eecd39a00 100644 --- a/jupyter_notebook/log.py +++ b/jupyter_notebook/log.py @@ -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. diff --git a/jupyter_notebook/nbconvert/handlers.py b/jupyter_notebook/nbconvert/handlers.py index ae833449d..cc40a8553 100644 --- a/jupyter_notebook/nbconvert/handlers.py +++ b/jupyter_notebook/nbconvert/handlers.py @@ -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) diff --git a/jupyter_notebook/nbconvert/tests/test_nbconvert_handlers.py b/jupyter_notebook/nbconvert/tests/test_nbconvert_handlers.py index 352719f1c..0503f0ec5 100644 --- a/jupyter_notebook/nbconvert/tests/test_nbconvert_handlers.py +++ b/jupyter_notebook/nbconvert/tests/test_nbconvert_handlers.py @@ -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): diff --git a/jupyter_notebook/nbextensions.py b/jupyter_notebook/nbextensions.py index 9a4553c51..76a702737 100644 --- a/jupyter_notebook/nbextensions.py +++ b/jupyter_notebook/nbextensions.py @@ -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 = { diff --git a/jupyter_notebook/notebook/handlers.py b/jupyter_notebook/notebook/handlers.py index 08ae98bc0..bd14b31f5 100644 --- a/jupyter_notebook/notebook/handlers.py +++ b/jupyter_notebook/notebook/handlers.py @@ -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 diff --git a/jupyter_notebook/notebookapp.py b/jupyter_notebook/notebookapp.py index 3b756c21d..68f513446 100644 --- a/jupyter_notebook/notebookapp.py +++ b/jupyter_notebook/notebookapp.py @@ -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. diff --git a/jupyter_notebook/services/clusters/clustermanager.py b/jupyter_notebook/services/clusters/clustermanager.py index 6b82db658..65ca2da1d 100644 --- a/jupyter_notebook/services/clusters/clustermanager.py +++ b/jupyter_notebook/services/clusters/clustermanager.py @@ -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. diff --git a/jupyter_notebook/services/clusters/handlers.py b/jupyter_notebook/services/clusters/handlers.py index a6d6312dd..a9447b66f 100644 --- a/jupyter_notebook/services/clusters/handlers.py +++ b/jupyter_notebook/services/clusters/handlers.py @@ -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 diff --git a/jupyter_notebook/services/config/handlers.py b/jupyter_notebook/services/config/handlers.py index a7ff896e5..b4d72fe66 100644 --- a/jupyter_notebook/services/config/handlers.py +++ b/jupyter_notebook/services/config/handlers.py @@ -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): diff --git a/jupyter_notebook/services/config/manager.py b/jupyter_notebook/services/config/manager.py index 534d095a5..37694360d 100644 --- a/jupyter_notebook/services/config/manager.py +++ b/jupyter_notebook/services/config/manager.py @@ -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""" diff --git a/jupyter_notebook/services/contents/checkpoints.py b/jupyter_notebook/services/contents/checkpoints.py index d87b7cc95..1087214a4 100644 --- a/jupyter_notebook/services/contents/checkpoints.py +++ b/jupyter_notebook/services/contents/checkpoints.py @@ -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): diff --git a/jupyter_notebook/services/contents/filecheckpoints.py b/jupyter_notebook/services/contents/filecheckpoints.py index 425bae359..39f94c6ed 100644 --- a/jupyter_notebook/services/contents/filecheckpoints.py +++ b/jupyter_notebook/services/contents/filecheckpoints.py @@ -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): diff --git a/jupyter_notebook/services/contents/fileio.py b/jupyter_notebook/services/contents/fileio.py index 217f8f216..76caf3e87 100644 --- a/jupyter_notebook/services/contents/fileio.py +++ b/jupyter_notebook/services/contents/fileio.py @@ -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): diff --git a/jupyter_notebook/services/contents/filemanager.py b/jupyter_notebook/services/contents/filemanager.py index 44c42a90a..ea2f748b6 100644 --- a/jupyter_notebook/services/contents/filemanager.py +++ b/jupyter_notebook/services/contents/filemanager.py @@ -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 diff --git a/jupyter_notebook/services/contents/handlers.py b/jupyter_notebook/services/contents/handlers.py index 7baf7bbbd..5002659be 100644 --- a/jupyter_notebook/services/contents/handlers.py +++ b/jupyter_notebook/services/contents/handlers.py @@ -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 diff --git a/jupyter_notebook/services/contents/manager.py b/jupyter_notebook/services/contents/manager.py index a865ff4bc..c140591d0 100644 --- a/jupyter_notebook/services/contents/manager.py +++ b/jupyter_notebook/services/contents/manager.py @@ -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*\.') diff --git a/jupyter_notebook/services/contents/tests/test_contents_api.py b/jupyter_notebook/services/contents/tests/test_contents_api.py index 5743fa43b..70e7f6ea0 100644 --- a/jupyter_notebook/services/contents/tests/test_contents_api.py +++ b/jupyter_notebook/services/contents/tests/test_contents_api.py @@ -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 diff --git a/jupyter_notebook/services/contents/tests/test_fileio.py b/jupyter_notebook/services/contents/tests/test_fileio.py index b51728082..256c664ae 100644 --- a/jupyter_notebook/services/contents/tests/test_fileio.py +++ b/jupyter_notebook/services/contents/tests/test_fileio.py @@ -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 diff --git a/jupyter_notebook/services/contents/tests/test_manager.py b/jupyter_notebook/services/contents/tests/test_manager.py index 8612a5520..8b441b054 100644 --- a/jupyter_notebook/services/contents/tests/test_manager.py +++ b/jupyter_notebook/services/contents/tests/test_manager.py @@ -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 diff --git a/jupyter_notebook/services/kernels/handlers.py b/jupyter_notebook/services/kernels/handlers.py index 6b3a10b2f..55c220b21 100644 --- a/jupyter_notebook/services/kernels/handlers.py +++ b/jupyter_notebook/services/kernels/handlers.py @@ -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(): diff --git a/jupyter_notebook/services/kernels/kernelmanager.py b/jupyter_notebook/services/kernels/kernelmanager.py index 2ea2e82c6..d7b1988ac 100644 --- a/jupyter_notebook/services/kernels/kernelmanager.py +++ b/jupyter_notebook/services/kernels/kernelmanager.py @@ -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) diff --git a/jupyter_notebook/services/kernelspecs/handlers.py b/jupyter_notebook/services/kernelspecs/handlers.py index 72397788f..49fcfaada 100644 --- a/jupyter_notebook/services/kernelspecs/handlers.py +++ b/jupyter_notebook/services/kernelspecs/handlers.py @@ -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 diff --git a/jupyter_notebook/services/kernelspecs/tests/test_kernelspecs_api.py b/jupyter_notebook/services/kernelspecs/tests/test_kernelspecs_api.py index 76efe0218..4eaefb4de 100644 --- a/jupyter_notebook/services/kernelspecs/tests/test_kernelspecs_api.py +++ b/jupyter_notebook/services/kernelspecs/tests/test_kernelspecs_api.py @@ -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', diff --git a/jupyter_notebook/services/nbconvert/handlers.py b/jupyter_notebook/services/nbconvert/handlers.py index 1c74de5d6..edc55ce83 100644 --- a/jupyter_notebook/services/nbconvert/handlers.py +++ b/jupyter_notebook/services/nbconvert/handlers.py @@ -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 = {} diff --git a/jupyter_notebook/services/security/handlers.py b/jupyter_notebook/services/security/handlers.py index 18f7874cd..f182a0e2b 100644 --- a/jupyter_notebook/services/security/handlers.py +++ b/jupyter_notebook/services/security/handlers.py @@ -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 diff --git a/jupyter_notebook/services/sessions/handlers.py b/jupyter_notebook/services/sessions/handlers.py index 438f4d7b8..576f8a54b 100644 --- a/jupyter_notebook/services/sessions/handlers.py +++ b/jupyter_notebook/services/sessions/handlers.py @@ -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): diff --git a/jupyter_notebook/services/sessions/sessionmanager.py b/jupyter_notebook/services/sessions/sessionmanager.py index 516a97dbf..6104b1c34 100644 --- a/jupyter_notebook/services/sessions/sessionmanager.py +++ b/jupyter_notebook/services/sessions/sessionmanager.py @@ -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): diff --git a/jupyter_notebook/services/sessions/tests/test_sessions_api.py b/jupyter_notebook/services/sessions/tests/test_sessions_api.py index 005e3ba06..6f1611704 100644 --- a/jupyter_notebook/services/sessions/tests/test_sessions_api.py +++ b/jupyter_notebook/services/sessions/tests/test_sessions_api.py @@ -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.""" diff --git a/jupyter_notebook/static/auth/js/loginmain.js b/jupyter_notebook/static/auth/js/loginmain.js index a59b3fbb1..44a2bf31d 100644 --- a/jupyter_notebook/static/auth/js/loginmain.js +++ b/jupyter_notebook/static/auth/js/loginmain.js @@ -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 || {}; diff --git a/jupyter_notebook/static/auth/js/loginwidget.js b/jupyter_notebook/static/auth/js/loginwidget.js index 857caf1df..87b17f313 100644 --- a/jupyter_notebook/static/auth/js/loginwidget.js +++ b/jupyter_notebook/static/auth/js/loginwidget.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/auth/js/logoutmain.js b/jupyter_notebook/static/auth/js/logoutmain.js index 882d7833f..b91b0fc4b 100644 --- a/jupyter_notebook/static/auth/js/logoutmain.js +++ b/jupyter_notebook/static/auth/js/logoutmain.js @@ -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 || {}; diff --git a/jupyter_notebook/static/base/js/dialog.js b/jupyter_notebook/static/base/js/dialog.js index 79ac239d5..0040ca80f 100644 --- a/jupyter_notebook/static/base/js/dialog.js +++ b/jupyter_notebook/static/base/js/dialog.js @@ -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) { diff --git a/jupyter_notebook/static/base/js/events.js b/jupyter_notebook/static/base/js/events.js index 48d318335..4cab05db2 100644 --- a/jupyter_notebook/static/base/js/events.js +++ b/jupyter_notebook/static/base/js/events.js @@ -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 diff --git a/jupyter_notebook/static/base/js/keyboard.js b/jupyter_notebook/static/base/js/keyboard.js index fe02abbbb..70a7cea4f 100644 --- a/jupyter_notebook/static/base/js/keyboard.js +++ b/jupyter_notebook/static/base/js/keyboard.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. /** * diff --git a/jupyter_notebook/static/base/js/namespace.js b/jupyter_notebook/static/base/js/namespace.js index 112719734..2d9919c09 100644 --- a/jupyter_notebook/static/base/js/namespace.js +++ b/jupyter_notebook/static/base/js/namespace.js @@ -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 || {}; diff --git a/jupyter_notebook/static/base/js/notificationarea.js b/jupyter_notebook/static/base/js/notificationarea.js index 53607fea1..94b764998 100644 --- a/jupyter_notebook/static/base/js/notificationarea.js +++ b/jupyter_notebook/static/base/js/notificationarea.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/base/js/notificationwidget.js b/jupyter_notebook/static/base/js/notificationwidget.js index 303ca2bf4..21a72f661 100644 --- a/jupyter_notebook/static/base/js/notificationwidget.js +++ b/jupyter_notebook/static/base/js/notificationwidget.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/base/js/page.js b/jupyter_notebook/static/base/js/page.js index 1fa67274b..5749af1d5 100644 --- a/jupyter_notebook/static/base/js/page.js +++ b/jupyter_notebook/static/base/js/page.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/base/js/security.js b/jupyter_notebook/static/base/js/security.js index 11ba8da43..872d50573 100644 --- a/jupyter_notebook/static/base/js/security.js +++ b/jupyter_notebook/static/base/js/security.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/base/js/utils.js b/jupyter_notebook/static/base/js/utils.js index 05ea389d0..ccdc46aca 100644 --- a/jupyter_notebook/static/base/js/utils.js +++ b/jupyter_notebook/static/base/js/utils.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/base/less/page.less b/jupyter_notebook/static/base/less/page.less index 56533dd70..754ca6cc3 100644 --- a/jupyter_notebook/static/base/less/page.less +++ b/jupyter_notebook/static/base/less/page.less @@ -1,7 +1,7 @@ /** * Primary styles * - * Author: IPython Development Team + * Author: Jupyter Development Team */ diff --git a/jupyter_notebook/static/edit/js/editor.js b/jupyter_notebook/static/edit/js/editor.js index dd12ea477..ddbc2ded2 100644 --- a/jupyter_notebook/static/edit/js/editor.js +++ b/jupyter_notebook/static/edit/js/editor.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/edit/js/main.js b/jupyter_notebook/static/edit/js/main.js index 49d883b2b..3b8ea77a6 100644 --- a/jupyter_notebook/static/edit/js/main.js +++ b/jupyter_notebook/static/edit/js/main.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. require([ diff --git a/jupyter_notebook/static/edit/js/menubar.js b/jupyter_notebook/static/edit/js/menubar.js index ef5f9ae86..fbf7e8043 100644 --- a/jupyter_notebook/static/edit/js/menubar.js +++ b/jupyter_notebook/static/edit/js/menubar.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/edit/js/savewidget.js b/jupyter_notebook/static/edit/js/savewidget.js index 456e42b1c..d90eb0b35 100644 --- a/jupyter_notebook/static/edit/js/savewidget.js +++ b/jupyter_notebook/static/edit/js/savewidget.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/about.js b/jupyter_notebook/static/notebook/js/about.js index b8f106e65..b42da08e1 100644 --- a/jupyter_notebook/static/notebook/js/about.js +++ b/jupyter_notebook/static/notebook/js/about.js @@ -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', diff --git a/jupyter_notebook/static/notebook/js/actions.js b/jupyter_notebook/static/notebook/js/actions.js index 245f4ecb7..a9153f197 100644 --- a/jupyter_notebook/static/notebook/js/actions.js +++ b/jupyter_notebook/static/notebook/js/actions.js @@ -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){ diff --git a/jupyter_notebook/static/notebook/js/cell.js b/jupyter_notebook/static/notebook/js/cell.js index dda60e3d6..7e9bc460b 100644 --- a/jupyter_notebook/static/notebook/js/cell.js +++ b/jupyter_notebook/static/notebook/js/cell.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. /** diff --git a/jupyter_notebook/static/notebook/js/celltoolbar.js b/jupyter_notebook/static/notebook/js/celltoolbar.js index 23c8d20da..654bcc0e0 100644 --- a/jupyter_notebook/static/notebook/js/celltoolbar.js +++ b/jupyter_notebook/static/notebook/js/celltoolbar.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/celltoolbarpresets/default.js b/jupyter_notebook/static/notebook/js/celltoolbarpresets/default.js index 142373803..fe457f6c9 100644 --- a/jupyter_notebook/static/notebook/js/celltoolbarpresets/default.js +++ b/jupyter_notebook/static/notebook/js/celltoolbarpresets/default.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/celltoolbarpresets/example.js b/jupyter_notebook/static/notebook/js/celltoolbarpresets/example.js index dd1653c76..0e631706e 100644 --- a/jupyter_notebook/static/notebook/js/celltoolbarpresets/example.js +++ b/jupyter_notebook/static/notebook/js/celltoolbarpresets/example.js @@ -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 diff --git a/jupyter_notebook/static/notebook/js/celltoolbarpresets/rawcell.js b/jupyter_notebook/static/notebook/js/celltoolbarpresets/rawcell.js index 7a33ed228..f3e23453e 100644 --- a/jupyter_notebook/static/notebook/js/celltoolbarpresets/rawcell.js +++ b/jupyter_notebook/static/notebook/js/celltoolbarpresets/rawcell.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/celltoolbarpresets/slideshow.js b/jupyter_notebook/static/notebook/js/celltoolbarpresets/slideshow.js index 6b2b35e87..50dc96db2 100644 --- a/jupyter_notebook/static/notebook/js/celltoolbarpresets/slideshow.js +++ b/jupyter_notebook/static/notebook/js/celltoolbarpresets/slideshow.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/codecell.js b/jupyter_notebook/static/notebook/js/codecell.js index 909c5c73c..7577c366b 100644 --- a/jupyter_notebook/static/notebook/js/codecell.js +++ b/jupyter_notebook/static/notebook/js/codecell.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. /** * diff --git a/jupyter_notebook/static/notebook/js/completer.js b/jupyter_notebook/static/notebook/js/completer.js index 0fb433e38..81a5776f3 100644 --- a/jupyter_notebook/static/notebook/js/completer.js +++ b/jupyter_notebook/static/notebook/js/completer.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/contexthint.js b/jupyter_notebook/static/notebook/js/contexthint.js index 30b7cd723..22fdbcd8f 100644 --- a/jupyter_notebook/static/notebook/js/contexthint.js +++ b/jupyter_notebook/static/notebook/js/contexthint.js @@ -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 diff --git a/jupyter_notebook/static/notebook/js/kernelselector.js b/jupyter_notebook/static/notebook/js/kernelselector.js index 8e9936250..c08a737e9 100644 --- a/jupyter_notebook/static/notebook/js/kernelselector.js +++ b/jupyter_notebook/static/notebook/js/kernelselector.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/keyboardmanager.js b/jupyter_notebook/static/notebook/js/keyboardmanager.js index e1a3eab13..883c5f308 100644 --- a/jupyter_notebook/static/notebook/js/keyboardmanager.js +++ b/jupyter_notebook/static/notebook/js/keyboardmanager.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. /** * diff --git a/jupyter_notebook/static/notebook/js/main.js b/jupyter_notebook/static/notebook/js/main.js index 31df711f6..de288401b 100644 --- a/jupyter_notebook/static/notebook/js/main.js +++ b/jupyter_notebook/static/notebook/js/main.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. require([ diff --git a/jupyter_notebook/static/notebook/js/maintoolbar.js b/jupyter_notebook/static/notebook/js/maintoolbar.js index c7e8a8175..b31bd69c3 100644 --- a/jupyter_notebook/static/notebook/js/maintoolbar.js +++ b/jupyter_notebook/static/notebook/js/maintoolbar.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/mathjaxutils.js b/jupyter_notebook/static/notebook/js/mathjaxutils.js index ba5b59bb2..b656a476a 100644 --- a/jupyter_notebook/static/notebook/js/mathjaxutils.js +++ b/jupyter_notebook/static/notebook/js/mathjaxutils.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/menubar.js b/jupyter_notebook/static/notebook/js/menubar.js index 41a47e74a..56f1099c9 100644 --- a/jupyter_notebook/static/notebook/js/menubar.js +++ b/jupyter_notebook/static/notebook/js/menubar.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/notebook.js b/jupyter_notebook/static/notebook/js/notebook.js index c665065a1..db3519e54 100644 --- a/jupyter_notebook/static/notebook/js/notebook.js +++ b/jupyter_notebook/static/notebook/js/notebook.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. /** diff --git a/jupyter_notebook/static/notebook/js/outputarea.js b/jupyter_notebook/static/notebook/js/outputarea.js index 42091fa7a..a945de4c1 100644 --- a/jupyter_notebook/static/notebook/js/outputarea.js +++ b/jupyter_notebook/static/notebook/js/outputarea.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/pager.js b/jupyter_notebook/static/notebook/js/pager.js index 881d57508..f74c89231 100644 --- a/jupyter_notebook/static/notebook/js/pager.js +++ b/jupyter_notebook/static/notebook/js/pager.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/quickhelp.js b/jupyter_notebook/static/notebook/js/quickhelp.js index 36402139f..6158b1da1 100644 --- a/jupyter_notebook/static/notebook/js/quickhelp.js +++ b/jupyter_notebook/static/notebook/js/quickhelp.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/savewidget.js b/jupyter_notebook/static/notebook/js/savewidget.js index d1c6f6e9c..9b57e1f76 100644 --- a/jupyter_notebook/static/notebook/js/savewidget.js +++ b/jupyter_notebook/static/notebook/js/savewidget.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/scrollmanager.js b/jupyter_notebook/static/notebook/js/scrollmanager.js index 552b326e8..86fff8a50 100644 --- a/jupyter_notebook/static/notebook/js/scrollmanager.js +++ b/jupyter_notebook/static/notebook/js/scrollmanager.js @@ -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"; diff --git a/jupyter_notebook/static/notebook/js/textcell.js b/jupyter_notebook/static/notebook/js/textcell.js index ff9f1f323..ce01ce8d8 100644 --- a/jupyter_notebook/static/notebook/js/textcell.js +++ b/jupyter_notebook/static/notebook/js/textcell.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/toolbar.js b/jupyter_notebook/static/notebook/js/toolbar.js index 1740283c8..2882ad0ae 100644 --- a/jupyter_notebook/static/notebook/js/toolbar.js +++ b/jupyter_notebook/static/notebook/js/toolbar.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/tooltip.js b/jupyter_notebook/static/notebook/js/tooltip.js index 6a7e7647a..9441eb622 100644 --- a/jupyter_notebook/static/notebook/js/tooltip.js +++ b/jupyter_notebook/static/notebook/js/tooltip.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/js/tour.js b/jupyter_notebook/static/notebook/js/tour.js index 78f23ccd2..e644e1769 100644 --- a/jupyter_notebook/static/notebook/js/tour.js +++ b/jupyter_notebook/static/notebook/js/tour.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/notebook/less/tooltip.less b/jupyter_notebook/static/notebook/less/tooltip.less index b155ac290..ee372d69d 100644 --- a/jupyter_notebook/static/notebook/less/tooltip.less +++ b/jupyter_notebook/static/notebook/less/tooltip.less @@ -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 diff --git a/jupyter_notebook/static/services/config.js b/jupyter_notebook/static/services/config.js index 0d2a9f91d..a03dae037 100644 --- a/jupyter_notebook/static/services/config.js +++ b/jupyter_notebook/static/services/config.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/services/contents.js b/jupyter_notebook/static/services/contents.js index 263c05294..b2b17b6a2 100644 --- a/jupyter_notebook/static/services/contents.js +++ b/jupyter_notebook/static/services/contents.js @@ -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) { diff --git a/jupyter_notebook/static/services/kernels/comm.js b/jupyter_notebook/static/services/kernels/comm.js index 44af2a901..519cf6b1a 100644 --- a/jupyter_notebook/static/services/kernels/comm.js +++ b/jupyter_notebook/static/services/kernels/comm.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/services/kernels/kernel.js b/jupyter_notebook/static/services/kernels/kernel.js index 0c03ff2b7..35dc06f37 100644 --- a/jupyter_notebook/static/services/kernels/kernel.js +++ b/jupyter_notebook/static/services/kernels/kernel.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/services/kernels/serialize.js b/jupyter_notebook/static/services/kernels/serialize.js index 460ef9b9f..a0bfd7ad8 100644 --- a/jupyter_notebook/static/services/kernels/serialize.js +++ b/jupyter_notebook/static/services/kernels/serialize.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/services/sessions/session.js b/jupyter_notebook/static/services/sessions/session.js index 5790b6d97..ac79f33e9 100644 --- a/jupyter_notebook/static/services/sessions/session.js +++ b/jupyter_notebook/static/services/sessions/session.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/style/style.min.css b/jupyter_notebook/static/style/style.min.css index 4fbc99f2f..e3ffebfe5 100644 --- a/jupyter_notebook/static/style/style.min.css +++ b/jupyter_notebook/static/style/style.min.css @@ -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 diff --git a/jupyter_notebook/static/terminal/js/main.js b/jupyter_notebook/static/terminal/js/main.js index 682f34431..3358882fc 100644 --- a/jupyter_notebook/static/terminal/js/main.js +++ b/jupyter_notebook/static/terminal/js/main.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. require([ diff --git a/jupyter_notebook/static/tree/js/clusterlist.js b/jupyter_notebook/static/tree/js/clusterlist.js index 83930c9cd..7e0c056e7 100644 --- a/jupyter_notebook/static/tree/js/clusterlist.js +++ b/jupyter_notebook/static/tree/js/clusterlist.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/tree/js/kernellist.js b/jupyter_notebook/static/tree/js/kernellist.js index 2af18fea0..8b2e8f837 100644 --- a/jupyter_notebook/static/tree/js/kernellist.js +++ b/jupyter_notebook/static/tree/js/kernellist.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/tree/js/main.js b/jupyter_notebook/static/tree/js/main.js index 9a93bcff1..6228925c9 100644 --- a/jupyter_notebook/static/tree/js/main.js +++ b/jupyter_notebook/static/tree/js/main.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. require([ diff --git a/jupyter_notebook/static/tree/js/newnotebook.js b/jupyter_notebook/static/tree/js/newnotebook.js index 2256bfa68..b2088887b 100644 --- a/jupyter_notebook/static/tree/js/newnotebook.js +++ b/jupyter_notebook/static/tree/js/newnotebook.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/tree/js/notebooklist.js b/jupyter_notebook/static/tree/js/notebooklist.js index 61ed4b3ec..76f239692 100644 --- a/jupyter_notebook/static/tree/js/notebooklist.js +++ b/jupyter_notebook/static/tree/js/notebooklist.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/tree/js/sessionlist.js b/jupyter_notebook/static/tree/js/sessionlist.js index 44a29afda..edb5328d9 100644 --- a/jupyter_notebook/static/tree/js/sessionlist.js +++ b/jupyter_notebook/static/tree/js/sessionlist.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/tree/js/terminallist.js b/jupyter_notebook/static/tree/js/terminallist.js index 8616549ec..13952bf8e 100644 --- a/jupyter_notebook/static/tree/js/terminallist.js +++ b/jupyter_notebook/static/tree/js/terminallist.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/tree/less/tree.less b/jupyter_notebook/static/tree/less/tree.less index e75587f8f..c01a48698 100644 --- a/jupyter_notebook/static/tree/less/tree.less +++ b/jupyter_notebook/static/tree/less/tree.less @@ -2,7 +2,7 @@ /** * Primary styles * - * Author: IPython Development Team + * Author: Jupyter Development Team */ @dashboard_tb_pad: 4px; diff --git a/jupyter_notebook/static/widgets/js/init.js b/jupyter_notebook/static/widgets/js/init.js index da09f54e8..45a3f2165 100644 --- a/jupyter_notebook/static/widgets/js/init.js +++ b/jupyter_notebook/static/widgets/js/init.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/manager.js b/jupyter_notebook/static/widgets/js/manager.js index c81a47485..ee927cb82 100644 --- a/jupyter_notebook/static/widgets/js/manager.js +++ b/jupyter_notebook/static/widgets/js/manager.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/widget.js b/jupyter_notebook/static/widgets/js/widget.js index 6638b2fc0..2481fe89b 100644 --- a/jupyter_notebook/static/widgets/js/widget.js +++ b/jupyter_notebook/static/widgets/js/widget.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define(["widgets/js/manager", diff --git a/jupyter_notebook/static/widgets/js/widget_bool.js b/jupyter_notebook/static/widgets/js/widget_bool.js index e576e2828..c9749471b 100644 --- a/jupyter_notebook/static/widgets/js/widget_bool.js +++ b/jupyter_notebook/static/widgets/js/widget_bool.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/widget_box.js b/jupyter_notebook/static/widgets/js/widget_box.js index 8cbf21214..0a374add2 100644 --- a/jupyter_notebook/static/widgets/js/widget_box.js +++ b/jupyter_notebook/static/widgets/js/widget_box.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/widget_button.js b/jupyter_notebook/static/widgets/js/widget_button.js index a2e6bd4a9..6dc85d19f 100644 --- a/jupyter_notebook/static/widgets/js/widget_button.js +++ b/jupyter_notebook/static/widgets/js/widget_button.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/widget_float.js b/jupyter_notebook/static/widgets/js/widget_float.js index 1ab98ebd0..d3bc2cf32 100644 --- a/jupyter_notebook/static/widgets/js/widget_float.js +++ b/jupyter_notebook/static/widgets/js/widget_float.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/widget_image.js b/jupyter_notebook/static/widgets/js/widget_image.js index 1c926e689..263f75de9 100644 --- a/jupyter_notebook/static/widgets/js/widget_image.js +++ b/jupyter_notebook/static/widgets/js/widget_image.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/widget_int.js b/jupyter_notebook/static/widgets/js/widget_int.js index 55af301b6..b693c42e2 100644 --- a/jupyter_notebook/static/widgets/js/widget_int.js +++ b/jupyter_notebook/static/widgets/js/widget_int.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/widget_link.js b/jupyter_notebook/static/widgets/js/widget_link.js index ba76dbd36..03329bf38 100644 --- a/jupyter_notebook/static/widgets/js/widget_link.js +++ b/jupyter_notebook/static/widgets/js/widget_link.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/widget_output.js b/jupyter_notebook/static/widgets/js/widget_output.js index a9fa4c3bd..4fa235c40 100644 --- a/jupyter_notebook/static/widgets/js/widget_output.js +++ b/jupyter_notebook/static/widgets/js/widget_output.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/widget_selection.js b/jupyter_notebook/static/widgets/js/widget_selection.js index d601cb7d2..3077d4aa6 100644 --- a/jupyter_notebook/static/widgets/js/widget_selection.js +++ b/jupyter_notebook/static/widgets/js/widget_selection.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/widget_selectioncontainer.js b/jupyter_notebook/static/widgets/js/widget_selectioncontainer.js index 446a2360a..4cfc0e73b 100644 --- a/jupyter_notebook/static/widgets/js/widget_selectioncontainer.js +++ b/jupyter_notebook/static/widgets/js/widget_selectioncontainer.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/static/widgets/js/widget_string.js b/jupyter_notebook/static/widgets/js/widget_string.js index 81bd8e3cd..ac34889ae 100644 --- a/jupyter_notebook/static/widgets/js/widget_string.js +++ b/jupyter_notebook/static/widgets/js/widget_string.js @@ -1,4 +1,4 @@ -// Copyright (c) IPython Development Team. +// Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. define([ diff --git a/jupyter_notebook/terminal/handlers.py b/jupyter_notebook/terminal/handlers.py index 06769eb1e..5a14e95ff 100644 --- a/jupyter_notebook/terminal/handlers.py +++ b/jupyter_notebook/terminal/handlers.py @@ -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. import tornado diff --git a/jupyter_notebook/tests/launchnotebook.py b/jupyter_notebook/tests/launchnotebook.py index 18740e48f..f2cad0898 100644 --- a/jupyter_notebook/tests/launchnotebook.py +++ b/jupyter_notebook/tests/launchnotebook.py @@ -12,7 +12,7 @@ from unittest import TestCase from tornado.ioloop import IOLoop from ..notebookapp import NotebookApp -from IPython.utils.tempdir import TemporaryDirectory +from ipython_genutils.tempdir import TemporaryDirectory MAX_WAITTIME = 30 # seconds to wait for notebook server to start POLL_INTERVAL = 0.1 # time between attempts diff --git a/jupyter_notebook/tests/test_files.py b/jupyter_notebook/tests/test_files.py index 6c53fcf81..1b7ee1b42 100644 --- a/jupyter_notebook/tests/test_files.py +++ b/jupyter_notebook/tests/test_files.py @@ -10,14 +10,14 @@ pjoin = os.path.join import requests import json -from IPython.nbformat import write -from IPython.nbformat.v4 import (new_notebook, +from jupyter_nbformat import write +from jupyter_nbformat.v4 import (new_notebook, new_markdown_cell, new_code_cell, new_output) from jupyter_notebook.utils import url_path_join from .launchnotebook import NotebookTestBase -from IPython.utils import py3compat +from ipython_genutils import py3compat class FilesTest(NotebookTestBase): diff --git a/jupyter_notebook/tests/test_nbextensions.py b/jupyter_notebook/tests/test_nbextensions.py index 2d83bad1d..a25e5a22d 100644 --- a/jupyter_notebook/tests/test_nbextensions.py +++ b/jupyter_notebook/tests/test_nbextensions.py @@ -1,7 +1,7 @@ # coding: utf-8 """Test installation of notebook extensions""" -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. import glob @@ -19,9 +19,9 @@ try: except ImportError: import mock # py2 -import IPython.testing.decorators as dec -from IPython.utils import py3compat -from IPython.utils.tempdir import TemporaryDirectory +import ipython_genutils.testing.decorators as dec +from ipython_genutils import py3compat +from ipython_genutils.tempdir import TemporaryDirectory from jupyter_notebook import nbextensions from jupyter_notebook.nbextensions import install_nbextension, check_nbextension diff --git a/jupyter_notebook/tests/test_notebookapp.py b/jupyter_notebook/tests/test_notebookapp.py index 8cee3277e..5f72aaa0d 100644 --- a/jupyter_notebook/tests/test_notebookapp.py +++ b/jupyter_notebook/tests/test_notebookapp.py @@ -9,8 +9,8 @@ import nose.tools as nt from traitlets.tests.utils import check_help_all_output -from IPython.utils.tempdir import TemporaryDirectory -from IPython.utils.traitlets import TraitError +from ipython_genutils.tempdir import TemporaryDirectory +from traitlets import TraitError from jupyter_notebook import notebookapp NotebookApp = notebookapp.NotebookApp diff --git a/jupyter_notebook/tests/test_serialize.py b/jupyter_notebook/tests/test_serialize.py index 9d45d6bc8..600928b0a 100644 --- a/jupyter_notebook/tests/test_serialize.py +++ b/jupyter_notebook/tests/test_serialize.py @@ -4,7 +4,7 @@ import os import nose.tools as nt -from IPython.kernel.zmq.session import Session +from jupyter_client.session import Session from ..base.zmqhandlers import ( serialize_binary_message, deserialize_binary_message, diff --git a/jupyter_notebook/tests/test_utils.py b/jupyter_notebook/tests/test_utils.py index 9cc7d4558..4aae72591 100644 --- a/jupyter_notebook/tests/test_utils.py +++ b/jupyter_notebook/tests/test_utils.py @@ -9,7 +9,7 @@ import nose.tools as nt from traitlets.tests.utils import check_help_all_output from jupyter_notebook.utils import url_escape, url_unescape, is_hidden -from IPython.utils.tempdir import TemporaryDirectory +from ipython_genutils.tempdir import TemporaryDirectory def test_help_output(): diff --git a/jupyter_notebook/tests/widgets/widget.js b/jupyter_notebook/tests/widgets/widget.js index 5b09298fe..4b0a54646 100644 --- a/jupyter_notebook/tests/widgets/widget.js +++ b/jupyter_notebook/tests/widgets/widget.js @@ -63,7 +63,7 @@ casper.notebook_test(function () { // Try creating the multiset widget, verify that sets the values correctly. var multiset = {}; multiset.index = this.append_cell([ - 'from IPython.utils.traitlets import Unicode, CInt', + 'from traitlets import Unicode, CInt', 'class MultiSetWidget(widgets.Widget):', ' _view_name = Unicode("MultiSetView", sync=True)', ' a = CInt(0, sync=True)', @@ -185,7 +185,7 @@ casper.notebook_test(function () { var testwidget = {}; this.append_cell_execute_then([ 'from jupyter_notebook import widgets', - 'from IPython.utils.traitlets import Unicode, Instance, List', + 'from traitlets import Unicode, Instance, List', 'from IPython.display import display', 'from array import array', 'def _array_to_memoryview(x):', diff --git a/jupyter_notebook/tree/handlers.py b/jupyter_notebook/tree/handlers.py index cf94e5c6c..a1ad1354b 100644 --- a/jupyter_notebook/tree/handlers.py +++ b/jupyter_notebook/tree/handlers.py @@ -1,6 +1,6 @@ """Tornado handlers for the tree view.""" -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from tornado import web diff --git a/jupyter_notebook/tree/tests/test_tree_handler.py b/jupyter_notebook/tree/tests/test_tree_handler.py index 8c771bb10..f6078383a 100644 --- a/jupyter_notebook/tree/tests/test_tree_handler.py +++ b/jupyter_notebook/tree/tests/test_tree_handler.py @@ -2,8 +2,8 @@ import os import io from jupyter_notebook.utils import url_path_join -from IPython.nbformat import write -from IPython.nbformat.v4 import new_notebook +from jupyter_nbformat import write +from jupyter_nbformat.v4 import new_notebook import requests diff --git a/jupyter_notebook/utils.py b/jupyter_notebook/utils.py index c79798c0f..75fd1ac92 100644 --- a/jupyter_notebook/utils.py +++ b/jupyter_notebook/utils.py @@ -1,6 +1,6 @@ """Notebook related utilities""" -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from __future__ import print_function @@ -16,7 +16,7 @@ try: except ImportError: from urllib import quote, unquote -from IPython.utils import py3compat +from ipython_genutils import py3compat # UF_HIDDEN is a stat flag not defined in the stat module. # It is used by BSD to indicate hidden files. @@ -165,7 +165,7 @@ def _check_pid_win32(pid): return bool(ctypes.windll.kernel32.OpenProcess(1,0,pid)) def _check_pid_posix(pid): - """Copy of IPython.utils.pro""" + """Copy of IPython.utils.process.check_pid""" try: os.kill(pid, 0) except OSError as err: diff --git a/jupyter_notebook/widgets/deprecated.py b/jupyter_notebook/widgets/deprecated.py index 481c08f6f..f6f9585a4 100644 --- a/jupyter_notebook/widgets/deprecated.py +++ b/jupyter_notebook/widgets/deprecated.py @@ -1,6 +1,6 @@ """Decorator for warning about deprecated widget classes""" -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from warnings import warn diff --git a/jupyter_notebook/widgets/interaction.py b/jupyter_notebook/widgets/interaction.py index 05d747e48..4b7ddb4fa 100644 --- a/jupyter_notebook/widgets/interaction.py +++ b/jupyter_notebook/widgets/interaction.py @@ -1,6 +1,6 @@ """Interact with functions using widgets.""" -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from __future__ import print_function @@ -16,8 +16,8 @@ from jupyter_notebook.widgets import (Widget, Text, FloatSlider, IntSlider, Checkbox, Dropdown, Box, Button, DOMWidget) from IPython.display import display, clear_output -from IPython.utils.py3compat import string_types, unicode_type -from IPython.utils.traitlets import HasTraits, Any, Unicode +from ipython_genutils.py3compat import string_types, unicode_type +from traitlets import HasTraits, Any, Unicode empty = Parameter.empty diff --git a/jupyter_notebook/widgets/tests/test_interaction.py b/jupyter_notebook/widgets/tests/test_interaction.py index 5f9b70275..41a1308a4 100644 --- a/jupyter_notebook/widgets/tests/test_interaction.py +++ b/jupyter_notebook/widgets/tests/test_interaction.py @@ -1,6 +1,6 @@ """Test interact and interactive.""" -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from __future__ import print_function @@ -12,10 +12,10 @@ except ImportError: import nose.tools as nt -from IPython.kernel.comm import Comm +from ipython_kernel.comm import Comm from jupyter_notebook import widgets from jupyter_notebook.widgets import interact, interactive, Widget, interaction -from IPython.utils.py3compat import annotate +from ipython_genutils.py3compat import annotate #----------------------------------------------------------------------------- # Utility stuff diff --git a/jupyter_notebook/widgets/tests/test_link.py b/jupyter_notebook/widgets/tests/test_link.py index 1247be5e7..4f06644ee 100644 --- a/jupyter_notebook/widgets/tests/test_link.py +++ b/jupyter_notebook/widgets/tests/test_link.py @@ -1,4 +1,4 @@ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. import nose.tools as nt diff --git a/jupyter_notebook/widgets/tests/test_traits.py b/jupyter_notebook/widgets/tests/test_traits.py index 5ac4d5839..6840fc373 100644 --- a/jupyter_notebook/widgets/tests/test_traits.py +++ b/jupyter_notebook/widgets/tests/test_traits.py @@ -1,10 +1,10 @@ """Test trait types of the widget packages.""" -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from unittest import TestCase -from IPython.utils.traitlets import HasTraits +from traitlets import HasTraits from traitlets.tests.test_traitlets import TraitTestBase from jupyter_notebook.widgets import Color, EventfulDict, EventfulList diff --git a/jupyter_notebook/widgets/trait_types.py b/jupyter_notebook/widgets/trait_types.py index b6bb67027..7ac1ceaac 100644 --- a/jupyter_notebook/widgets/trait_types.py +++ b/jupyter_notebook/widgets/trait_types.py @@ -3,11 +3,11 @@ Trait types for html widgets. """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. import re -from IPython.utils import traitlets +import traitlets from . import eventful diff --git a/jupyter_notebook/widgets/widget.py b/jupyter_notebook/widgets/widget.py index bbc2fb524..22b1667de 100644 --- a/jupyter_notebook/widgets/widget.py +++ b/jupyter_notebook/widgets/widget.py @@ -1,27 +1,21 @@ """Base Widget class. Allows user to create widgets in the back-end that render in the IPython notebook front-end. """ -#----------------------------------------------------------------------------- -# Copyright (c) 2013, the IPython Development Team. -# + +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -#----------------------------------------------------------------------------- -#----------------------------------------------------------------------------- -# Imports -#----------------------------------------------------------------------------- + from contextlib import contextmanager import collections from IPython.core.getipython import get_ipython -from IPython.kernel.comm import Comm -from IPython.config import LoggingConfigurable -from IPython.utils.importstring import import_item -from IPython.utils.traitlets import Unicode, Dict, Instance, Bool, List, \ +from ipython_kernel.comm import Comm +from traitlets.config import LoggingConfigurable +from ipython_genutils.importstring import import_item +from traitlets import Unicode, Dict, Instance, Bool, List, \ CaselessStrEnum, Tuple, CUnicode, Int, Set -from IPython.utils.py3compat import string_types +from ipython_genutils.py3compat import string_types from .trait_types import Color @@ -51,9 +45,6 @@ widget_serialization = { } -#----------------------------------------------------------------------------- -# Classes -#----------------------------------------------------------------------------- class CallbackDispatcher(LoggingConfigurable): """A structure for registering and running callbacks""" callbacks = List() @@ -156,7 +147,7 @@ class Widget(LoggingConfigurable): If empty, look in the global registry.""", sync=True) _view_name = Unicode(None, allow_none=True, help="""Default view registered in the front-end to use to represent the widget.""", sync=True) - comm = Instance('IPython.kernel.comm.Comm', allow_none=True) + comm = Instance('ipython_kernel.comm.Comm', allow_none=True) msg_throttle = Int(3, sync=True, help="""Maximum number of msgs the front-end can send before receiving an idle msg from the back-end.""") diff --git a/jupyter_notebook/widgets/widget_bool.py b/jupyter_notebook/widgets/widget_bool.py index ea897b5fc..8ac7a9e7d 100644 --- a/jupyter_notebook/widgets/widget_bool.py +++ b/jupyter_notebook/widgets/widget_bool.py @@ -3,11 +3,11 @@ Represents a boolean using a widget. """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from .widget import DOMWidget, register -from IPython.utils.traitlets import Unicode, Bool, CaselessStrEnum +from traitlets import Unicode, Bool, CaselessStrEnum from .deprecated import DeprecatedClass diff --git a/jupyter_notebook/widgets/widget_box.py b/jupyter_notebook/widgets/widget_box.py index 4a38ee66a..67a1ffa2a 100644 --- a/jupyter_notebook/widgets/widget_box.py +++ b/jupyter_notebook/widgets/widget_box.py @@ -3,11 +3,11 @@ Represents a container that can be used to group other widgets. """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from .widget import DOMWidget, Widget, register, widget_serialization -from IPython.utils.traitlets import Unicode, Tuple, TraitError, Int, CaselessStrEnum +from traitlets import Unicode, Tuple, TraitError, Int, CaselessStrEnum from .deprecated import DeprecatedClass diff --git a/jupyter_notebook/widgets/widget_button.py b/jupyter_notebook/widgets/widget_button.py index a2692f4f1..9ae2e426d 100644 --- a/jupyter_notebook/widgets/widget_button.py +++ b/jupyter_notebook/widgets/widget_button.py @@ -4,11 +4,11 @@ Represents a button in the frontend using a widget. Allows user to listen for click events on the button and trigger backend code when the clicks are fired. """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from .widget import DOMWidget, CallbackDispatcher, register -from IPython.utils.traitlets import Unicode, Bool, CaselessStrEnum +from traitlets import Unicode, Bool, CaselessStrEnum from .deprecated import DeprecatedClass diff --git a/jupyter_notebook/widgets/widget_float.py b/jupyter_notebook/widgets/widget_float.py index 914552adc..dcc9dc16f 100644 --- a/jupyter_notebook/widgets/widget_float.py +++ b/jupyter_notebook/widgets/widget_float.py @@ -3,12 +3,12 @@ Represents an unbounded float using a widget. """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from .widget import DOMWidget, register from .trait_types import Color -from IPython.utils.traitlets import (Unicode, CFloat, Bool, CaselessStrEnum, +from traitlets import (Unicode, CFloat, Bool, CaselessStrEnum, Tuple, TraitError) from .deprecated import DeprecatedClass diff --git a/jupyter_notebook/widgets/widget_image.py b/jupyter_notebook/widgets/widget_image.py index 06b1f03ec..c1f9dfdf6 100644 --- a/jupyter_notebook/widgets/widget_image.py +++ b/jupyter_notebook/widgets/widget_image.py @@ -3,13 +3,13 @@ Represents an image in the frontend using a widget. """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. import base64 from .widget import DOMWidget, register -from IPython.utils.traitlets import Unicode, CUnicode, Bytes +from traitlets import Unicode, CUnicode, Bytes from .deprecated import DeprecatedClass @register('IPython.Image') diff --git a/jupyter_notebook/widgets/widget_int.py b/jupyter_notebook/widgets/widget_int.py index d7b146c80..ce75aff26 100644 --- a/jupyter_notebook/widgets/widget_int.py +++ b/jupyter_notebook/widgets/widget_int.py @@ -3,12 +3,12 @@ Represents an unbounded int using a widget. """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from .widget import DOMWidget, register from .trait_types import Color -from IPython.utils.traitlets import (Unicode, CInt, Bool, CaselessStrEnum, +from traitlets import (Unicode, CInt, Bool, CaselessStrEnum, Tuple, TraitError) from .deprecated import DeprecatedClass diff --git a/jupyter_notebook/widgets/widget_link.py b/jupyter_notebook/widgets/widget_link.py index 8f5df89cd..2a4048a2f 100644 --- a/jupyter_notebook/widgets/widget_link.py +++ b/jupyter_notebook/widgets/widget_link.py @@ -3,11 +3,11 @@ Propagate changes between widgets on the javascript side """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from .widget import Widget -from IPython.utils.traitlets import Unicode, Tuple, List,Instance, TraitError +from traitlets import Unicode, Tuple, List,Instance, TraitError class WidgetTraitTuple(Tuple): """Traitlet for validating a single (Widget, 'trait_name') pair""" @@ -77,7 +77,7 @@ class DirectionalLink(Widget): source = WidgetTraitTuple(sync=True) # Does not quite behave like other widgets but reproduces - # the behavior of IPython.utils.traitlets.directional_link + # the behavior of traitlets.directional_link def __init__(self, source, targets, **kwargs): if len(targets) < 1: raise TypeError("Require at least two widgets to link") diff --git a/jupyter_notebook/widgets/widget_output.py b/jupyter_notebook/widgets/widget_output.py index 777cf09e0..8e6dbfb88 100644 --- a/jupyter_notebook/widgets/widget_output.py +++ b/jupyter_notebook/widgets/widget_output.py @@ -3,14 +3,14 @@ Represents a widget that can be used to display output within the widget area. """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from .widget import DOMWidget import sys -from IPython.utils.traitlets import Unicode, List +from traitlets import Unicode, List from IPython.display import clear_output -from IPython.kernel.zmq.session import Message +from jupyter_client.session import Message class Output(DOMWidget): """Widget used as a context manager to display output. diff --git a/jupyter_notebook/widgets/widget_selection.py b/jupyter_notebook/widgets/widget_selection.py index 3f7561d30..26b643449 100644 --- a/jupyter_notebook/widgets/widget_selection.py +++ b/jupyter_notebook/widgets/widget_selection.py @@ -3,17 +3,17 @@ Represents an enumeration using a widget. """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from collections import OrderedDict from threading import Lock from .widget import DOMWidget, register -from IPython.utils.traitlets import ( +from traitlets import ( Unicode, Bool, Any, Dict, TraitError, CaselessStrEnum, Tuple, List ) -from IPython.utils.py3compat import unicode_type +from ipython_genutils.py3compat import unicode_type from .deprecated import DeprecatedClass diff --git a/jupyter_notebook/widgets/widget_selectioncontainer.py b/jupyter_notebook/widgets/widget_selectioncontainer.py index e6df2e68c..784c1383d 100644 --- a/jupyter_notebook/widgets/widget_selectioncontainer.py +++ b/jupyter_notebook/widgets/widget_selectioncontainer.py @@ -4,11 +4,11 @@ Represents a multipage container that can be used to group other widgets into pages. """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from .widget_box import Box, register -from IPython.utils.traitlets import Unicode, Dict, CInt +from traitlets import Unicode, Dict, CInt from .deprecated import DeprecatedClass class _SelectionContainer(Box): diff --git a/jupyter_notebook/widgets/widget_string.py b/jupyter_notebook/widgets/widget_string.py index a71f58954..8e5f1e83f 100644 --- a/jupyter_notebook/widgets/widget_string.py +++ b/jupyter_notebook/widgets/widget_string.py @@ -3,11 +3,11 @@ Represents a unicode string using a widget. """ -# Copyright (c) IPython Development Team. +# Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. from .widget import DOMWidget, CallbackDispatcher, register -from IPython.utils.traitlets import Unicode, Bool +from traitlets import Unicode, Bool from .deprecated import DeprecatedClass