##// END OF EJS Templates
Compatibility fix for Tornado 3.x
Thomas Kluyver -
Show More
@@ -3,6 +3,7 b''
3 # Copyright (c) IPython Development Team.
3 # Copyright (c) IPython Development Team.
4 # Distributed under the terms of the Modified BSD License.
4 # Distributed under the terms of the Modified BSD License.
5
5
6 import tornado
6 from tornado import web
7 from tornado import web
7 import terminado
8 import terminado
8 from ..base.handlers import IPythonHandler
9 from ..base.handlers import IPythonHandler
@@ -25,4 +26,18 b' class TermSocket(terminado.TermSocket, IPythonHandler):'
25 def get(self, *args, **kwargs):
26 def get(self, *args, **kwargs):
26 if not self.get_current_user():
27 if not self.get_current_user():
27 raise web.HTTPError(403)
28 raise web.HTTPError(403)
28 return super(TermSocket, self).get(*args, **kwargs)
29
30 # FIXME: only do super get on tornado ≥ 4
31 # tornado 3 has no get, will raise 405
32 if tornado.version_info >= (4,):
33 return super(TermSocket, self).get(*args, **kwargs)
34
35 def open(self, *args, **kwargs):
36 if tornado.version_info < (4,):
37 try:
38 self.get(*self.open_args, **self.open_kwargs)
39 except web.HTTPError:
40 self.close()
41 raise
42
43 super(TermSocket, self).open(*args, **kwargs)
General Comments 0
You need to be logged in to leave comments. Login now