cleanup from code review

Author: Zsailer

jupyter_server/base/zmqhandlers.py

@@ -1,9 +1,17 @@
-"""Add deprecation warning here.
-"""
+"""This module is deprecated in Jupyter Server 2.0"""
+# Raise a warning that this module is deprecated.
+import warnings
+
 from jupyter_server.services.kernels.connection.base import (
     deserialize_binary_message,
     deserialize_msg_from_ws_v1,
     serialize_binary_message,
     serialize_msg_to_ws_v1,
 )
 from jupyter_server.services.kernels.websocket import WebSocketMixin
+
+warnings.warn(
+    "jupyter_server.base.zmqhandlers module is deprecated in Jupyter Server 2.0",
+    DeprecationWarning,
+    stacklevel=2,
+)

jupyter_server/serverapp.py

@@ -36,6 +36,10 @@
 from tornado import httpserver, ioloop, web
 from tornado.httputil import url_concat
 from tornado.log import LogFormatter, access_log, app_log, gen_log
+
+if not sys.platform.startswith("win"):
+    from tornado.netutil import bind_unix_socket
+
 from traitlets import (
     Any,
     Bool,
@@ -142,29 +146,12 @@
 except (ImportError, AttributeError, AssertionError) as e:  # pragma: no cover
     raise ImportError(_i18n("The Jupyter Server requires tornado >=%s.%s.%s") % MIN_TORNADO) from e
 
-
 try:
     import resource
 except ImportError:
     # Windows
     resource = None  # type:ignore[assignment]
 
-
-# the minimum viable tornado version: needs to be kept in sync with setup.py
-MIN_TORNADO = (6, 1, 0)
-
-try:
-    import tornado
-
-    assert tornado.version_info >= MIN_TORNADO
-except (ImportError, AttributeError, AssertionError) as e:  # pragma: no cover
-    raise ImportError(_i18n("The Jupyter Server requires tornado >=%s.%s.%s") % MIN_TORNADO) from e
-
-
-if not sys.platform.startswith("win"):
-    from tornado.netutil import bind_unix_socket
-
-
 # -----------------------------------------------------------------------------
 # Module globals
 # -----------------------------------------------------------------------------

jupyter_server/services/kernels/connection/channels.py

@@ -308,7 +308,7 @@ async def prepare(self):
         t0 = time.time()
         while not await ensure_async(self.kernel_manager.is_alive()):
             await asyncio.sleep(0.1)
-            if time.time() - t0 > self.multi_kernel_manager.kernel_info_timeout:
+            if (time.time() - t0) > self.multi_kernel_manager.kernel_info_timeout:
                 raise TimeoutError("Kernel never reached an 'alive' state.")
 
         self.session.key = self.kernel_manager.session.key