upgrade to 14.4.1upstream/14.4.1

3 files changed, 47 insertions, 0 deletions

diff --git a/zmq/green/eventloop/__init__.py b/zmq/green/eventloop/__init__.py
new file mode 100644
index 0000000..c5150ef
--- /dev/null
+++ b/zmq/green/eventloop/__init__.py
@@ -0,0 +1,3 @@
+from zmq.green.eventloop.ioloop import IOLoop
+
+__all__ = ['IOLoop']
\ No newline at end of file
diff --git a/zmq/green/eventloop/ioloop.py b/zmq/green/eventloop/ioloop.py
new file mode 100644
index 0000000..e12fd5e
--- /dev/null
+++ b/zmq/green/eventloop/ioloop.py
@@ -0,0 +1,33 @@
+from zmq.eventloop.ioloop import *
+from zmq.green import Poller
+
+RealIOLoop = IOLoop
+RealZMQPoller = ZMQPoller
+
+class IOLoop(RealIOLoop):
+    
+    def initialize(self, impl=None):
+        impl = _poll() if impl is None else impl
+        super(IOLoop, self).initialize(impl)
+
+    @staticmethod
+    def instance():
+        """Returns a global `IOLoop` instance.
+        
+        Most applications have a single, global `IOLoop` running on the
+        main thread.  Use this method to get this instance from
+        another thread.  To get the current thread's `IOLoop`, use `current()`.
+        """
+        # install this class as the active IOLoop implementation
+        # when using tornado 3
+        if tornado_version >= (3,):
+            PollIOLoop.configure(IOLoop)
+        return PollIOLoop.instance()
+
+
+class ZMQPoller(RealZMQPoller):
+    """gevent-compatible version of ioloop.ZMQPoller"""
+    def __init__(self):
+        self._poller = Poller()
+
+_poll = ZMQPoller
diff --git a/zmq/green/eventloop/zmqstream.py b/zmq/green/eventloop/zmqstream.py
new file mode 100644
index 0000000..90fbd1f
--- /dev/null
+++ b/zmq/green/eventloop/zmqstream.py
@@ -0,0 +1,11 @@
+from zmq.eventloop.zmqstream import *
+
+from zmq.green.eventloop.ioloop import IOLoop
+
+RealZMQStream = ZMQStream
+
+class ZMQStream(RealZMQStream):
+    
+    def __init__(self, socket, io_loop=None):
+        io_loop = io_loop or IOLoop.instance()
+        super(ZMQStream, self).__init__(socket, io_loop=io_loop)