From e667734febf29a5aa43da186166a5aec062dd420 2011-02-14 21:47:51 From: MinRK Date: 2011-02-14 21:47:51 Subject: [PATCH] Merge branch 'master' of https://github.com/dwyde/ipython closes gh-203 --- diff --git a/IPython/zmq/blockingkernelmanager.py b/IPython/zmq/blockingkernelmanager.py index 5bbff3d..1015620 100644 --- a/IPython/zmq/blockingkernelmanager.py +++ b/IPython/zmq/blockingkernelmanager.py @@ -47,7 +47,7 @@ class BlockingSubSocketChannel(SubSocketChannel): def get_msg(self, block=True, timeout=None): """Get a message if there is one that is ready.""" - return self.in_queue.get(block, timeout) + return self._in_queue.get(block, timeout) def get_msgs(self): """Get all messages that are currently ready.""" @@ -79,7 +79,7 @@ class BlockingXReqSocketChannel(XReqSocketChannel): def get_msg(self, block=True, timeout=None): """Get a message if there is one that is ready.""" - return self.in_queue.get(block, timeout) + return self._in_queue.get(block, timeout) def get_msgs(self): """Get all messages that are currently ready."""