Use requirejs to perform redirect.

Author: jdfreder

jupyter_notebook/notebookapp.py

@@ -9,7 +9,6 @@
 import base64
 import datetime
 import errno
-import imp
 import importlib
 import io
 import json
@@ -99,12 +98,6 @@
 ipython notebook --profile=sympy       # use the sympy profile
 ipython notebook --certfile=mycert.pem # use SSL/TLS certificate
 """
-DEPRECATED_WIDGET_WARNING = """
-console.warn("/static/widgets/js/ is deprecated, import from nbextensions/widgets/widgets/js/ instead.");
-"""
-MISSING_WIDGET_ERROR = """
-throw new Error('Python package `ipython_widgets` not installed.  Please install it on the host.');
-"""
 
 #-----------------------------------------------------------------------------
 # Helper functions
@@ -221,7 +214,7 @@ def init_handlers(self, settings):
 
         # Order matters. The first handler to match the URL will handle the request.
         handlers = []
-        handlers.extend(self._create_widget_shim_handlers())
+        handlers.extend(self._create_widget_shim_handlers(settings))
         handlers.extend(load_handlers('tree.handlers'))
         handlers.extend([(r"/login", settings['login_handler_class'])])
         handlers.extend([(r"/logout", settings['logout_handler_class'])])
@@ -270,43 +263,21 @@ def init_handlers(self, settings):
         new_handlers.append((r'(.*)', Template404))
         return new_handlers
 
-    def _create_widget_shim_handlers(self):
+    def _create_widget_shim_handlers(self, settings):
         """Creates a handler that shims the loading of widgets
         JS files for the old /static/widgets/js/*.js path."""
-        # Add RESTful shim for the ipython_widgets
-        try:
-            ipythonwidgets = imp.find_module('ipython_widgets')[1]
-            widget_js = os.path.join(ipythonwidgets, 'static', 'widgets')
-
-            class DeprecationHandler(IPythonHandler):
-                def get(self, url_path):
-                    self.set_header("Content-Type", 'text/javascript')
-
-                    # Verify that the file requested exists.
-                    local_file = os.path.join(widget_js, *url_path.split('/'))
-                    if not os.path.isfile(local_file):
-                        self.set_status(404)
-                        self.finish("File doesn't exits")
-
-                    # Read the file and append the warning.
-                    with open(local_file, 'r') as f:
-                        contents = f.read()
-                    self.finish(DEPRECATED_WIDGET_WARNING + contents)
-                    self.log.warn('Deprecated widget Javascript path /static/widgets/js/*.js was used')
-            return [(
-                r'/deprecatedwidgets/(.*)', 
-                DeprecationHandler
-            )]
-        except: # ipython_widgets is not installed
-            class ErrorHandler(IPythonHandler):
-                def get(self, *args, **kwargs):
-                    self.set_header("Content-Type", 'text/javascript')
-                    self.finish(MISSING_WIDGET_ERROR)
-                    self.log.warn("Attempt to import widget javascript failed, `ipython_widgets` is not installed")
-            return [(
-                r'/deprecatedwidgets/(.*)', 
-                ErrorHandler
-            )]
+        class DeprecationHandler(IPythonHandler):
+            def get(self, url_path):
+                self.set_header("Content-Type", 'text/javascript')
+                self.finish("""
+                    console.warn('`/static/widgets/js` is deprecated.  Use `/nbextensions/widgets/widgets/js` instead.');
+                    define(['%s'], function(x) { console.log('...loaded...'); return x; });
+                """ % url_path_join(settings['base_url'], 'nbextensions', 'widgets', 'widgets', url_path))
+                self.log.warn('Deprecated widget Javascript path /static/widgets/js/*.js was used')
+        return [(
+            r'/deprecatedwidgets/(.*)', 
+            DeprecationHandler
+        )]
 
 
 class NbserverListApp(JupyterApp):