From d94d6dbffa1da77ca40935b027d0b435373e143e Mon Sep 17 00:00:00 2001 From: MinRK Date: Tue, 22 Nov 2011 15:13:21 -0800 Subject: [PATCH] use pyzmq tools where appropriate ZMQStream is the right object to use for event-driven handling of messages, but instead we chose to rewrite half of it in KernelManager. This removes most of the duplicate code, in favor of using ZMQStream. also use the pyzmq install() function for using pyzmq with tornado, instead of manually pasting its contents in notebook app. --- IPython/frontend/html/notebook/notebookapp.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py index bdef5adc2..24f018888 100644 --- a/IPython/frontend/html/notebook/notebookapp.py +++ b/IPython/frontend/html/notebook/notebookapp.py @@ -32,8 +32,7 @@ import zmq # Install the pyzmq ioloop. This has to be done before anything else from # tornado is imported. from zmq.eventloop import ioloop -import tornado.ioloop -tornado.ioloop.IOLoop = ioloop.IOLoop +ioloop.install() from tornado import httpserver from tornado import web