Restore detection of missing terminado package

notebook/notebookapp.py

@@ -91,7 +91,6 @@
 from .auth.login import LoginHandler
 from .auth.logout import LogoutHandler
 from .base.handlers import FileFindHandler
-from .terminal import TerminalManager
 
 from traitlets.config import Config
 from traitlets.config.application import catch_config_error, boolean_flag
@@ -132,6 +131,13 @@
 except ImportError:
     async_kernel_mgmt_available = False
 
+# Tolerate missing terminado package.
+try:
+    from .terminal import TerminalManager
+    terminado_available = True
+except ImportError:
+    terminado_available = False
+
 #-----------------------------------------------------------------------------
 # Module globals
 #-----------------------------------------------------------------------------
@@ -300,7 +306,7 @@ def init_settings(self, jupyter_app, kernel_manager, contents_manager,
             allow_password_change=jupyter_app.allow_password_change,
             server_root_dir=root_dir,
             jinja2_env=env,
-            terminals_available=False,  # Set later if terminals are available
+            terminals_available=terminado_available and jupyter_app.terminals_enabled,
         )
 
         # allow custom overrides for the tornado web app.
@@ -660,9 +666,12 @@ class NotebookApp(JupyterApp):
 
     classes = [
         KernelManager, Session, MappingKernelManager, KernelSpecManager,
-        ContentsManager, FileContentsManager, NotebookNotary, TerminalManager,
+        ContentsManager, FileContentsManager, NotebookNotary,
         GatewayKernelManager, GatewayKernelSpecManager, GatewaySessionManager, GatewayClient,
     ]
+    if terminado_available:  # Only necessary when terminado is available
+        classes.append(TerminalManager)
+
     flags = Dict(flags)
     aliases = Dict(aliases)
 
@@ -1469,6 +1478,12 @@ def _update_server_extensions(self, change):
          is not available.
          """))
 
+    # Since use of terminals is also a function of whether the terminado package is
+    # avaialble, this variable holds the "final indication" of whether terminal functionality
+    # should be considered (particularly during shutdown/cleanup).  It is enabled only
+    # once both the terminals "service" can be initialized and terminals_enabled is True.
+    terminals_in_use = False
+
     def parse_command_line(self, argv=None):
         super(NotebookApp, self).parse_command_line(argv)
 
@@ -1759,7 +1774,7 @@ def init_terminals(self):
         try:
             from .terminal import initialize
             initialize(nb_app=self)
-            self.web_app.settings['terminals_available'] = True
+            self.terminals_in_use = True
         except ImportError as e:
             self.log.warning(_("Terminals not available (error was %s)"), e)
 
@@ -1908,13 +1923,12 @@ def shutdown_no_activity(self):
         if len(km) != 0:
             return   # Kernels still running
 
-        try:
-            term_mgr = self.web_app.settings['terminal_manager']
-        except KeyError:
-            pass  # Terminals not enabled
-        else:
-            if term_mgr.terminals:
-                return   # Terminals still running
+        if not self.terminals_in_use:
+            return
+
+        term_mgr = self.web_app.settings['terminal_manager']
+        if term_mgr.terminals:
+            return   # Terminals still running
 
         seconds_since_active = \
             (utcnow() - self.web_app.last_activity()).total_seconds()
@@ -2000,11 +2014,10 @@ def cleanup_terminals(self):
         The terminals will shutdown themselves when this process no longer exists,
         but explicit shutdown allows the TerminalManager to cleanup.
         """
-        try:
-            terminal_manager = self.web_app.settings['terminal_manager']
-        except KeyError:
-            return  # Terminals not enabled
+        if not self.terminals_in_use:
+            return
 
+        terminal_manager = self.web_app.settings['terminal_manager']
         n_terminals = len(terminal_manager.list())
         terminal_msg = trans.ngettext('Shutting down %d terminal', 'Shutting down %d terminals', n_terminals)
         self.log.info(terminal_msg % n_terminals)

notebook/terminal/__init__.py

@@ -3,11 +3,10 @@
 import terminado
 from ..utils import check_version
 
-if not check_version(terminado.__version__, '0.8.1'):
-    raise ImportError("terminado >= 0.8.1 required, found %s" % terminado.__version__)
+if not check_version(terminado.__version__, '0.8.3'):
+    raise ImportError("terminado >= 0.8.3 required, found %s" % terminado.__version__)
 
 from ipython_genutils.py3compat import which
-from tornado.log import app_log
 from notebook.utils import url_path_join as ujoin
 from .terminalmanager import TerminalManager
 from .handlers import TerminalHandler, TermSocket