diff --git a/eventlet/green/zmq.py b/eventlet/green/zmq.py index c2d8a44..68b8625 100644 --- a/eventlet/green/zmq.py +++ b/eventlet/green/zmq.py @@ -71,7 +71,7 @@ class Socket(__zmq__.Socket): def _send_message(self, msg, flags=0): if flags & __zmq__.NOBLOCK: - super(Socket,self)._send_message(msg, flags) + super(Socket, self)._send_message(msg, flags) return flags |= __zmq__.NOBLOCK while True: @@ -85,7 +85,7 @@ class Socket(__zmq__.Socket): def _send_copy(self, msg, flags=0): if flags & __zmq__.NOBLOCK: - super(Socket,self)._send_copy(msg, flags) + super(Socket, self)._send_copy(msg, flags) return flags |= __zmq__.NOBLOCK while True: @@ -99,7 +99,7 @@ class Socket(__zmq__.Socket): def _recv_message(self, flags=0, track=False): if flags & __zmq__.NOBLOCK: - return super(Socket,self)._recv_message(flags) + return super(Socket, self)._recv_message(flags, track) flags |= __zmq__.NOBLOCK while True: try: @@ -113,7 +113,7 @@ class Socket(__zmq__.Socket): def _recv_copy(self, flags=0): if flags & __zmq__.NOBLOCK: - return super(Socket,self)._recv_copy(flags) + return super(Socket, self)._recv_copy(flags) flags |= __zmq__.NOBLOCK while True: try: diff --git a/tests/zmq_test.py b/tests/zmq_test.py index 4401ded..4ca53c6 100644 --- a/tests/zmq_test.py +++ b/tests/zmq_test.py @@ -228,6 +228,13 @@ got '%s'" % (zmq.ZMQError(errno), zmq.ZMQError(e.errno))) # but it's private __str__ appears to be the way to go self.assertEqual([str(m) for m in recieved_msg], msg2) + @skip_unless_zmq + def test_recv_noblock_bug76(self): + req, rep, port = self.create_bound_pair(zmq.REQ, zmq.REP) + self.assertRaisesErrno(zmq.EAGAIN, rep.recv, zmq.NOBLOCK) + self.assertRaisesErrno(zmq.EAGAIN, rep.recv, zmq.NOBLOCK, True) + + class TestThreadedContextAccess(TestCase): """zmq's Context must be unique within a hub