##// END OF EJS Templates
Merge branch 'master' into trunk
Brian Granger -
r3128:925c98c8 merge
parent child Browse files
Show More
@@ -113,8 +113,9 b' class Kernel(Configurable):'
113 113 return
114 114 else:
115 115 raise
116 # FIXME: Bug in pyzmq/zmq?
117 # assert self.reply_socket.rcvmore(), "Missing message part."
116 # This assert will raise in versions of zeromq 2.0.7 and lesser.
117 # We now require 2.0.8 or above, so we can uncomment for safety.
118 assert self.reply_socket.rcvmore(), "Missing message part."
118 119 msg = self.reply_socket.recv_json()
119 120
120 121 # Print some info about this message and leave a '--->' marker, so it's
General Comments 0
You need to be logged in to leave comments. Login now