add ioloop.install to backported patches

IPython/frontend/html/notebook/notebookapp.py

@@ -35,13 +35,7 b' 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

IPython/zmq/__init__.py

@@ -20,6 +20,17 b' def patch_pyzmq():'
     """
     
     import zmq
+    
+    # ioloop.install, introduced in pyzmq 2.1.7
+    from zmq.eventloop import ioloop
+    
+    def install():
+        import tornado.ioloop
+        tornado.ioloop.IOLoop = ioloop.IOLoop
+    
+    if not hasattr(ioloop, 'install'):
+        ioloop.install = install
+    
     # fix missing DEALER/ROUTER aliases in pyzmq < 2.1.9
     if not hasattr(zmq, 'DEALER'):
         zmq.DEALER = zmq.XREQ