From 2ab768b71b5d1b3bf4798a2f8a9073bbbfc623fc Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Mon, 1 Feb 2016 08:19:05 -0800 Subject: [PATCH] Update to point to widgetsnbextension --- notebook/notebookapp.py | 6 +++--- notebook/static/notebook/js/main.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py index aca66c566..c68700c6f 100644 --- a/notebook/notebookapp.py +++ b/notebook/notebookapp.py @@ -241,12 +241,12 @@ class NotebookWebApplication(web.Application): # BEGIN HARDCODED WIDGETS HACK widgets = None try: - widgets = __import__('jupyter-js-widgets-nbextension') + import widgetsnbextension as widgets except: try: - widgets = __import__('ipywidgets') + import ipywidgets as widgets except: - app_log.warning('Widgets are unavailable. Please install jupyter-js-widgets-nbextension or ipywidgets 4.0') + app_log.warning('Widgets are unavailable. Please install widgetsnbextension or ipywidgets 4.0') if widgets is not None: handlers.append( (r"/nbextensions/widgets/(.*)", FileFindHandler, { diff --git a/notebook/static/notebook/js/main.js b/notebook/static/notebook/js/main.js index a2a85ede9..327bf495d 100644 --- a/notebook/static/notebook/js/main.js +++ b/notebook/static/notebook/js/main.js @@ -59,7 +59,7 @@ require([ utils.load_extension('widgets/extension').catch(function () { // Fallback to the ipywidgets extension utils.load_extension('widgets/notebook/js/extension').catch(function () { - console.warn('ipywidgets package not installed. Widgets are not available.'); + console.warn('Widgets are not available. Please install widgetsnbextension or ipywidgets 4.0'); }); }); // END HARDCODED WIDGETS HACK