##// END OF EJS Templates
don't assume ioloop.install is defined (pyzmq < 2.1.7)
MinRK -
Show More
@@ -32,7 +32,13 b' import zmq'
32 # Install the pyzmq ioloop. This has to be done before anything else from
32 # Install the pyzmq ioloop. This has to be done before anything else from
33 # tornado is imported.
33 # tornado is imported.
34 from zmq.eventloop import ioloop
34 from zmq.eventloop import ioloop
35 # FIXME: ioloop.install is new in pyzmq-2.1.7, so remove this conditional
36 # when pyzmq dependency is updated beyond that.
37 if hasattr(ioloop, 'install'):
35 ioloop.install()
38 ioloop.install()
39 else:
40 import tornado.ioloop
41 tornado.ioloop.IOLoop = ioloop.IOLoop
36
42
37 from tornado import httpserver
43 from tornado import httpserver
38 from tornado import web
44 from tornado import web
General Comments 0
You need to be logged in to leave comments. Login now