Add separate handler for /terminals/new

Author: kevin-bates

notebook/terminal/__init__.py

@@ -10,7 +10,7 @@
 from ipython_genutils.py3compat import which
 from notebook.utils import url_path_join as ujoin
 from .terminalmanager import TerminalManager
-from .handlers import TerminalHandler, TermSocket, NewTerminalHandler
+from .handlers import TerminalHandler, TermSocket, NewTerminalHandler, NamedTerminalHandler
 from . import api_handlers
 
 
@@ -42,10 +42,11 @@ def initialize(nb_app):
     terminal_manager.log = nb_app.log
     base_url = nb_app.web_app.settings['base_url']
     handlers = [
+        (ujoin(base_url, r"/terminals/new"), NamedTerminalHandler),
+        (ujoin(base_url, r"/terminals/new/(\w+)"), NewTerminalHandler),
         (ujoin(base_url, r"/terminals/(\w+)"), TerminalHandler),
         (ujoin(base_url, r"/terminals/websocket/(\w+)"), TermSocket,
              {'term_manager': terminal_manager}),
-        (ujoin(base_url, r"/terminals/new/(\w+)"), NewTerminalHandler),
         (ujoin(base_url, r"/api/terminals"), api_handlers.TerminalRootHandler),
         (ujoin(base_url, r"/api/terminals/(\w+)"), api_handlers.TerminalHandler),
     ]

notebook/terminal/handlers.py

@@ -15,18 +15,22 @@ class TerminalHandler(IPythonHandler):
     """Render the terminal interface."""
     @web.authenticated
     def get(self, term_name):
-        if term_name == 'new':
-            model = self.terminal_manager.create()
-            term_name = model['name']
-            new_path = self.request.path.replace("terminals/new", "terminals/" + term_name)
-            self.redirect(new_path)
-        else:
-            self.write(self.render_template('terminal.html',
+        self.write(self.render_template('terminal.html',
                        ws_path="terminals/websocket/%s" % term_name))
 
 
+class NamedTerminalHandler(IPythonHandler):
+    """Creates and renders a named terminal interface."""
+    @web.authenticated
+    def get(self):
+        model = self.terminal_manager.create()
+        term_name = model['name']
+        new_path = self.request.path.replace("terminals/new", "terminals/" + term_name)
+        self.redirect(new_path)
+
+
 class NewTerminalHandler(IPythonHandler):
-    """Renders a new terminal interface using the named argument."""
+    """Creates and renders a terminal interface using the named argument."""
     @web.authenticated
     def get(self, term_name):
         if term_name == 'new':