Merge branch 'master' into dan_stateless

1 files changed, 0 insertions, 33 deletions

diff --git a/external_libs/python/zmq/green/eventloop/ioloop.py b/external_libs/python/zmq/green/eventloop/ioloop.py
deleted file mode 100644
index e12fd5e9..00000000
--- a/external_libs/python/zmq/green/eventloop/ioloop.py
+++ /dev/null
@@ -1,33 +0,0 @@
-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