From 6e19364cfd35d0d99827fe6feeb1a5ec4dab65fb Mon Sep 17 00:00:00 2001 From: Fernando Perez Date: Sun, 30 Oct 2011 13:12:12 -0700 Subject: [PATCH] Update version check to work with tornado 2.1.0 or 2.1.1 --- IPython/frontend/html/notebook/handlers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IPython/frontend/html/notebook/handlers.py b/IPython/frontend/html/notebook/handlers.py index 5679d2e83..e25f9a729 100644 --- a/IPython/frontend/html/notebook/handlers.py +++ b/IPython/frontend/html/notebook/handlers.py @@ -35,7 +35,7 @@ except ImportError: publish_string = None #----------------------------------------------------------------------------- -# Monkeypatch for Tornado 2.1.1 - Remove when no longer necessary! +# Monkeypatch for Tornado <= 2.1.1 - Remove when no longer necessary! #----------------------------------------------------------------------------- # Google Chrome, as of release 16, changed its websocket protocol number. The @@ -56,7 +56,7 @@ except ImportError: import tornado -if tornado.version == '2.1.1': +if tornado.version_info <= (2,1,1): def _execute(self, transforms, *args, **kwargs): from tornado.websocket import WebSocketProtocol8, WebSocketProtocol76