From 86e3e953daf88cc714cb12a199e7365f2fb04c20 Mon Sep 17 00:00:00 2001 From: MinRK Date: Mon, 23 Apr 2012 16:59:00 -0700 Subject: [PATCH] add ioloop.install to backported patches --- IPython/frontend/html/notebook/notebookapp.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py index 2387fc8ca..9c34df48a 100644 --- a/IPython/frontend/html/notebook/notebookapp.py +++ b/IPython/frontend/html/notebook/notebookapp.py @@ -35,13 +35,7 @@ import zmq # Install the pyzmq ioloop. This has to be done before anything else from # tornado is imported. from zmq.eventloop import ioloop -# FIXME: ioloop.install is new in pyzmq-2.1.7, so remove this conditional -# when pyzmq dependency is updated beyond that. -if hasattr(ioloop, 'install'): - ioloop.install() -else: - import tornado.ioloop - tornado.ioloop.IOLoop = ioloop.IOLoop +ioloop.install() from tornado import httpserver from tornado import web