##// END OF EJS Templates
Merge branch 'master' of https://github.com/dwyde/ipython...
MinRK -
r3323:e667734f merge
parent child Browse files
Show More
@@ -47,7 +47,7 b' class BlockingSubSocketChannel(SubSocketChannel):'
47
47
48 def get_msg(self, block=True, timeout=None):
48 def get_msg(self, block=True, timeout=None):
49 """Get a message if there is one that is ready."""
49 """Get a message if there is one that is ready."""
50 return self.in_queue.get(block, timeout)
50 return self._in_queue.get(block, timeout)
51
51
52 def get_msgs(self):
52 def get_msgs(self):
53 """Get all messages that are currently ready."""
53 """Get all messages that are currently ready."""
@@ -79,7 +79,7 b' class BlockingXReqSocketChannel(XReqSocketChannel):'
79
79
80 def get_msg(self, block=True, timeout=None):
80 def get_msg(self, block=True, timeout=None):
81 """Get a message if there is one that is ready."""
81 """Get a message if there is one that is ready."""
82 return self.in_queue.get(block, timeout)
82 return self._in_queue.get(block, timeout)
83
83
84 def get_msgs(self):
84 def get_msgs(self):
85 """Get all messages that are currently ready."""
85 """Get all messages that are currently ready."""
General Comments 0
You need to be logged in to leave comments. Login now