|
7 | 7 | import inspect
|
8 | 8 |
|
9 | 9 | from jupyter_server.utils import ensure_async
|
10 |
| -from tornado import httpclient, httputil, ioloop, version_info, websocket |
| 10 | +from tornado import httpclient, httputil, websocket |
11 | 11 |
|
12 | 12 |
|
13 | 13 | class PingableWSClientConnection(websocket.WebSocketClientConnection):
|
@@ -40,31 +40,21 @@ def pingable_ws_connect(
|
40 | 40 | request.headers = httputil.HTTPHeaders(request.headers)
|
41 | 41 | request = httpclient._RequestProxy(request, httpclient.HTTPRequest._DEFAULTS)
|
42 | 42 |
|
43 |
| - # for tornado 4.5.x compatibility |
44 |
| - if version_info[0] == 4: |
45 |
| - conn = PingableWSClientConnection( |
46 |
| - io_loop=ioloop.IOLoop.current(), |
47 |
| - compression_options={}, |
48 |
| - request=request, |
49 |
| - on_message_callback=on_message_callback, |
50 |
| - on_ping_callback=on_ping_callback, |
51 |
| - ) |
52 |
| - else: |
53 |
| - # resolver= parameter requires tornado >= 6.3. Only pass it if needed |
54 |
| - # (for Unix socket support), so older versions of tornado can still |
55 |
| - # work otherwise. |
56 |
| - kwargs = {"resolver": resolver} if resolver else {} |
57 |
| - conn = PingableWSClientConnection( |
58 |
| - request=request, |
59 |
| - compression_options={}, |
60 |
| - on_message_callback=on_message_callback, |
61 |
| - on_ping_callback=on_ping_callback, |
62 |
| - max_message_size=getattr( |
63 |
| - websocket, "_default_max_message_size", 10 * 1024 * 1024 |
64 |
| - ), |
65 |
| - subprotocols=subprotocols, |
66 |
| - **kwargs, |
67 |
| - ) |
| 43 | + # resolver= parameter requires tornado >= 6.3. Only pass it if needed |
| 44 | + # (for Unix socket support), so older versions of tornado can still |
| 45 | + # work otherwise. |
| 46 | + kwargs = {"resolver": resolver} if resolver else {} |
| 47 | + conn = PingableWSClientConnection( |
| 48 | + request=request, |
| 49 | + compression_options={}, |
| 50 | + on_message_callback=on_message_callback, |
| 51 | + on_ping_callback=on_ping_callback, |
| 52 | + max_message_size=getattr( |
| 53 | + websocket, "_default_max_message_size", 10 * 1024 * 1024 |
| 54 | + ), |
| 55 | + subprotocols=subprotocols, |
| 56 | + **kwargs, |
| 57 | + ) |
68 | 58 |
|
69 | 59 | return conn.connect_future
|
70 | 60 |
|
|
0 commit comments