From ce14f905e01a5b686fa2e1d8b910e3d23e238e28 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Thu, 30 Oct 2014 18:38:31 -0700 Subject: [PATCH] Fix terminals with Tornado 3 The websocket handler auth checking was calling clear_cookie(), which threw an error because it doesn't make sense for Websockets. It doesn't seem important, and we silence it in our other websocket handlers, so silencing it here too. --- IPython/html/terminal/handlers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IPython/html/terminal/handlers.py b/IPython/html/terminal/handlers.py index dc73f65f3..20e0fa7de 100644 --- a/IPython/html/terminal/handlers.py +++ b/IPython/html/terminal/handlers.py @@ -32,6 +32,10 @@ class TermSocket(terminado.TermSocket, IPythonHandler): # tornado 3 has no get, will raise 405 if tornado.version_info >= (4,): return super(TermSocket, self).get(*args, **kwargs) + + def clear_cookie(self, *args, **kwargs): + """meaningless for websockets""" + pass def open(self, *args, **kwargs): if tornado.version_info < (4,):