diff options
Diffstat (limited to 'eventlet')
-rw-r--r-- | eventlet/convenience.py | 1 | ||||
-rw-r--r-- | eventlet/db_pool.py | 2 | ||||
-rw-r--r-- | eventlet/event.py | 1 | ||||
-rw-r--r-- | eventlet/green/MySQLdb.py | 3 | ||||
-rw-r--r-- | eventlet/green/OpenSSL/SSL.py | 1 | ||||
-rw-r--r-- | eventlet/green/Queue.py | 1 | ||||
-rw-r--r-- | eventlet/green/os.py | 4 | ||||
-rw-r--r-- | eventlet/green/threading.py | 1 | ||||
-rw-r--r-- | eventlet/green/zmq.py | 1 | ||||
-rw-r--r-- | eventlet/greenio/py3.py | 1 | ||||
-rw-r--r-- | eventlet/greenthread.py | 1 | ||||
-rw-r--r-- | eventlet/patcher.py | 1 | ||||
-rw-r--r-- | eventlet/support/greendns.py | 1 |
13 files changed, 19 insertions, 0 deletions
diff --git a/eventlet/convenience.py b/eventlet/convenience.py index 5f99ade..a02284d 100644 --- a/eventlet/convenience.py +++ b/eventlet/convenience.py @@ -157,6 +157,7 @@ def wrap_ssl(sock, *a, **kw): """ return wrap_ssl_impl(sock, *a, **kw) + try: from eventlet.green import ssl wrap_ssl_impl = ssl.wrap_socket diff --git a/eventlet/db_pool.py b/eventlet/db_pool.py index 45b1771..ef74d99 100644 --- a/eventlet/db_pool.py +++ b/eventlet/db_pool.py @@ -361,6 +361,8 @@ class GenericConnectionWrapper(object): 'use_result', 'warning_count', ) + + for _proxy_fun in GenericConnectionWrapper._proxy_funcs: # excess wrapper for early binding (closure by value) def _wrapper(_proxy_fun=_proxy_fun): diff --git a/eventlet/event.py b/eventlet/event.py index 6ab455f..9d99a54 100644 --- a/eventlet/event.py +++ b/eventlet/event.py @@ -10,6 +10,7 @@ class NOT_USED: def __repr__(self): return 'NOT_USED' + NOT_USED = NOT_USED() diff --git a/eventlet/green/MySQLdb.py b/eventlet/green/MySQLdb.py index 3593542..2395e51 100644 --- a/eventlet/green/MySQLdb.py +++ b/eventlet/green/MySQLdb.py @@ -16,6 +16,8 @@ __orig_connections = __import__('MySQLdb.connections').connections def Connection(*args, **kw): conn = tpool.execute(__orig_connections.Connection, *args, **kw) return tpool.Proxy(conn, autowrap_names=('cursor',)) + + connect = Connect = Connection @@ -23,6 +25,7 @@ connect = Connect = Connection class MySQLdbConnectionsModule(object): pass + connections = MySQLdbConnectionsModule() for var in dir(__orig_connections): if not var.startswith('__'): diff --git a/eventlet/green/OpenSSL/SSL.py b/eventlet/green/OpenSSL/SSL.py index f534cea..bb06c8b 100644 --- a/eventlet/green/OpenSSL/SSL.py +++ b/eventlet/green/OpenSSL/SSL.py @@ -119,6 +119,7 @@ class GreenConnection(greenio.GreenSocket): timeout=self.gettimeout(), timeout_exc=socket.timeout) + Connection = ConnectionType = GreenConnection del greenio diff --git a/eventlet/green/Queue.py b/eventlet/green/Queue.py index f999c3b..59a9a30 100644 --- a/eventlet/green/Queue.py +++ b/eventlet/green/Queue.py @@ -28,5 +28,6 @@ class LifoQueue(queue.LifoQueue): maxsize = None super(LifoQueue, self).__init__(maxsize) + Empty = queue.Empty Full = queue.Full diff --git a/eventlet/green/os.py b/eventlet/green/os.py index e13a51e..2d1fe6a 100644 --- a/eventlet/green/os.py +++ b/eventlet/green/os.py @@ -29,6 +29,7 @@ def fdopen(fd, *args, **kw): except IOError as e: raise OSError(*e.args) + __original_read__ = os_orig.read @@ -51,6 +52,7 @@ def read(fd, n): except hubs.IOClosed: return '' + __original_write__ = os_orig.write @@ -77,6 +79,7 @@ def wait(): Wait for completion of a child process.""" return waitpid(0, 0) + __original_waitpid__ = os_orig.waitpid @@ -95,6 +98,7 @@ def waitpid(pid, options): return rpid, status greenthread.sleep(0.01) + __original_open__ = os_orig.open diff --git a/eventlet/green/threading.py b/eventlet/green/threading.py index fce9bca..93be29e 100644 --- a/eventlet/green/threading.py +++ b/eventlet/green/threading.py @@ -131,4 +131,5 @@ def current_thread(): return t + currentThread = current_thread diff --git a/eventlet/green/zmq.py b/eventlet/green/zmq.py index 1e41103..373aca1 100644 --- a/eventlet/green/zmq.py +++ b/eventlet/green/zmq.py @@ -148,6 +148,7 @@ def _wraps(source_fn): return dest_fn return wrapper + # Implementation notes: Each socket in 0mq contains a pipe that the # background IO threads use to communicate with the socket. These # events are important because they tell the socket when it is able to diff --git a/eventlet/greenio/py3.py b/eventlet/greenio/py3.py index fc6c67f..5762d6d 100644 --- a/eventlet/greenio/py3.py +++ b/eventlet/greenio/py3.py @@ -214,4 +214,5 @@ def GreenPipe(name, mode="r", buffering=-1, encoding=None, errors=None, return _open(name, mode, buffering, encoding, errors, newline, closefd, opener) + GreenPipe.__doc__ = greenpipe_doc diff --git a/eventlet/greenthread.py b/eventlet/greenthread.py index c26d5a1..28f0a57 100644 --- a/eventlet/greenthread.py +++ b/eventlet/greenthread.py @@ -145,6 +145,7 @@ def exc_after(seconds, *throw_args): hub = hubs.get_hub() return hub.schedule_call_local(seconds, getcurrent().throw, *throw_args) + # deprecate, remove TimeoutError, with_timeout = ( support.wrap_deprecated(old, new)(fun) for old, new, fun in ( diff --git a/eventlet/patcher.py b/eventlet/patcher.py index b249d6f..9c6727d 100644 --- a/eventlet/patcher.py +++ b/eventlet/patcher.py @@ -222,6 +222,7 @@ def original(modname): return sys.modules[original_name] + already_patched = {} diff --git a/eventlet/support/greendns.py b/eventlet/support/greendns.py index 6b5a6cb..658bb9c 100644 --- a/eventlet/support/greendns.py +++ b/eventlet/support/greendns.py @@ -924,6 +924,7 @@ def tcp(q, where, timeout=DNS_QUERY_TIMEOUT, port=53, def reset(): resolver.clear() + # Install our coro-friendly replacements for the tcp and udp query methods. dns.query.tcp = tcp dns.query.udp = udp |