Permalink
Browse files

also patching zmq.eventloop.ioloop so we d'ont get locked there as well

Conflicts:
	gevent_zeromq/__init__.py
  • Loading branch information...
1 parent 44879df commit a4830c80a6a68035b90286050794d1b0dafb52fc @tarekziade tarekziade committed with Mar 20, 2012
Showing with 6 additions and 4 deletions.
  1. +6 −4 gevent_zeromq/__init__.py
@@ -34,13 +34,15 @@
def monkey_patch():
"""
Monkey patches `zmq.Context` and `zmq.Socket`
-
+
If test_suite is True, the pyzmq test suite will be patched for
compatibility as well.
"""
ozmq = __import__('zmq')
- ozmq.Socket = zmq.GreenSocket
- ozmq.Context = zmq.GreenContext
- ozmq.Poller = GreenPoller
+ ozmq.Socket = zmq.Socket
+ ozmq.Context = zmq.Context
+ ozmq.Poller = zmq.Poller
+ ioloop = __import__('zmq.eventloop.ioloop')
+ ioloop.Poller = zmq.Poller
__all__ = zmq.__all__ + ['monkey_patch']

0 comments on commit a4830c8

Please sign in to comment.