Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tornado 6 compatibility #4449

Merged
merged 9 commits into from
Mar 6, 2019
Merged

tornado 6 compatibility #4449

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5712240
unpin tornado
minrk Mar 5, 2019
b1bd4e5
pip freeze on tornado
minrk Mar 5, 2019
5828300
fix check for closed connection
minrk Mar 5, 2019
dcee710
patch gen.maybe_future for compatibility with tornado 6
minrk Mar 5, 2019
aa4ffe3
test with stable Python 3.7
minrk Mar 5, 2019
71e1853
add test entries for tornado 4
minrk Mar 5, 2019
be35a37
gateway: compatibility with tornado 4
minrk Mar 5, 2019
d4e60d9
oops, no Python 2 on master
minrk Mar 5, 2019
0b73ab6
changelog for 5.7.5 [ci skip]
minrk Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions notebook/gateway/managers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from tornado import gen, web
from tornado.escape import json_encode, json_decode, url_escape
from tornado.httpclient import HTTPClient, AsyncHTTPClient, HTTPError
from tornado.simple_httpclient import HTTPTimeoutError

from ..services.kernels.kernelmanager import MappingKernelManager
from ..services.sessions.sessionmanager import SessionManager
Expand Down Expand Up @@ -259,9 +258,9 @@ def gateway_request(endpoint, **kwargs):
except ConnectionRefusedError:
raise web.HTTPError(503, "Connection refused from Gateway server url '{}'. "
"Check to be sure the Gateway instance is running.".format(GatewayClient.instance().url))
except HTTPTimeoutError:
except HTTPError:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

# This can occur if the host is valid (e.g., foo.com) but there's nothing there.
raise web.HTTPError(504, "Timeout error attempting to connect to Gateway server url '{}'. " \
raise web.HTTPError(504, "Error attempting to connect to Gateway server url '{}'. " \
"Ensure gateway url is valid and the Gateway instance is running.".format(
GatewayClient.instance().url))
except gaierror as e:
Expand Down