mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't assume ioloop.install is defined (pyzmq < 2.1.7)

Browse Source
This commit is contained in:
MinRK 2011-11-22 19:50:19 -08:00
parent d94d6dbffa
commit 8e2758c0ce
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IPython/frontend/html/notebook/notebookapp.py
View File

@ -32,7 +32,13 @@ import zmq
# Install the pyzmq ioloop. This has to be done before anything else from
# tornado is imported.
from zmq.eventloop import ioloop
ioloop.install()
# 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
from tornado import httpserver
from tornado import web