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