🍰 Got the new JS deprecation warning working

Author: jdfreder

jupyter_notebook/notebookapp.py

@@ -119,7 +119,17 @@ def load_handlers(name):
     name = 'jupyter_notebook.' + name
     mod = __import__(name, fromlist=['default_handlers'])
     return mod.default_handlers
-        
+
+
+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) { return x; });
+        """ % url_path_join('nbextensions', 'widgets', 'widgets', url_path.rstrip('.js')))
+        self.log.warn('Deprecated widget Javascript path /static/widgets/js/*.js was used')
+
 #-----------------------------------------------------------------------------
 # The Tornado web application
 #-----------------------------------------------------------------------------
@@ -131,7 +141,6 @@ def __init__(self, ipython_app, kernel_manager, contents_manager,
                  config_manager, log,
                  base_url, default_url, settings_overrides, jinja_env_options):
 
-        self.log = log
         settings = self.init_settings(
             ipython_app, kernel_manager, contents_manager, cluster_manager,
             session_manager, kernel_spec_manager, config_manager, log, base_url,
@@ -145,6 +154,7 @@ def init_settings(self, ipython_app, kernel_manager, contents_manager,
                       config_manager,
                       log, base_url, default_url, settings_overrides,
                       jinja_env_options=None):
+
         _template_path = settings_overrides.get(
             "template_path",
             ipython_app.template_file_path,
@@ -214,7 +224,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(settings))
+        handlers.append((r'/deprecatedwidgets/(.*)', DeprecationHandler))
         handlers.extend(load_handlers('tree.handlers'))
         handlers.extend([(r"/login", settings['login_handler_class'])])
         handlers.extend([(r"/logout", settings['logout_handler_class'])])
@@ -263,22 +273,6 @@ def init_handlers(self, settings):
         new_handlers.append((r'(.*)', Template404))
         return new_handlers
 
-    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."""
-        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):