From 0ecfdead9ba797218e848f10707af81f20689426 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Wed, 21 Feb 2024 19:57:16 +0100
Subject: [PATCH] Remove unreachable code for tornado 4

---
 jupyter_server_proxy/websocket.py | 42 ++++++++++++-------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/jupyter_server_proxy/websocket.py b/jupyter_server_proxy/websocket.py
index 8a9a9bd6..a43b7795 100644
--- a/jupyter_server_proxy/websocket.py
+++ b/jupyter_server_proxy/websocket.py
@@ -7,7 +7,7 @@
 import inspect
 
 from jupyter_server.utils import ensure_async
-from tornado import httpclient, httputil, ioloop, version_info, websocket
+from tornado import httpclient, httputil, websocket
 
 
 class PingableWSClientConnection(websocket.WebSocketClientConnection):
@@ -40,31 +40,21 @@ def pingable_ws_connect(
     request.headers = httputil.HTTPHeaders(request.headers)
     request = httpclient._RequestProxy(request, httpclient.HTTPRequest._DEFAULTS)
 
-    # for tornado 4.5.x compatibility
-    if version_info[0] == 4:
-        conn = PingableWSClientConnection(
-            io_loop=ioloop.IOLoop.current(),
-            compression_options={},
-            request=request,
-            on_message_callback=on_message_callback,
-            on_ping_callback=on_ping_callback,
-        )
-    else:
-        # resolver= parameter requires tornado >= 6.3. Only pass it if needed
-        # (for Unix socket support), so older versions of tornado can still
-        # work otherwise.
-        kwargs = {"resolver": resolver} if resolver else {}
-        conn = PingableWSClientConnection(
-            request=request,
-            compression_options={},
-            on_message_callback=on_message_callback,
-            on_ping_callback=on_ping_callback,
-            max_message_size=getattr(
-                websocket, "_default_max_message_size", 10 * 1024 * 1024
-            ),
-            subprotocols=subprotocols,
-            **kwargs,
-        )
+    # resolver= parameter requires tornado >= 6.3. Only pass it if needed
+    # (for Unix socket support), so older versions of tornado can still
+    # work otherwise.
+    kwargs = {"resolver": resolver} if resolver else {}
+    conn = PingableWSClientConnection(
+        request=request,
+        compression_options={},
+        on_message_callback=on_message_callback,
+        on_ping_callback=on_ping_callback,
+        max_message_size=getattr(
+            websocket, "_default_max_message_size", 10 * 1024 * 1024
+        ),
+        subprotocols=subprotocols,
+        **kwargs,
+    )
 
     return conn.connect_future