From 044ab877505cd6e80f9b1a24467b60aa28edb055 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Sun, 24 May 2009 18:34:48 +0700 Subject: [PATCH] rename eventlet.coropool to eventlet.pool --- eventlet/httpd.py | 4 ++-- eventlet/{coropool.py => pool.py} | 0 eventlet/wsgi.py | 4 ++-- greentest/saranwrap_test.py | 4 ++-- greentest/{test__coropool.py => test__pool.py} | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) rename eventlet/{coropool.py => pool.py} (100%) rename greentest/{test__coropool.py => test__pool.py} (96%) diff --git a/eventlet/httpd.py b/eventlet/httpd.py index c7e951d..8e25271 100644 --- a/eventlet/httpd.py +++ b/eventlet/httpd.py @@ -39,7 +39,7 @@ except ImportError: from StringIO import StringIO from eventlet import api -from eventlet import coropool +from eventlet import pool DEFAULT_MAX_HTTP_VERSION = 'HTTP/1.1' @@ -574,7 +574,7 @@ class Server(BaseHTTPServer.HTTPServer): def server(sock, site, log=None, max_size=512, serv=None, max_http_version=DEFAULT_MAX_HTTP_VERSION): - pool = coropool.Pool(max_size=max_size) + pool = pool.Pool(max_size=max_size) if serv is None: serv = Server(sock, sock.getsockname(), site, log, max_http_version=max_http_version) try: diff --git a/eventlet/coropool.py b/eventlet/pool.py similarity index 100% rename from eventlet/coropool.py rename to eventlet/pool.py diff --git a/eventlet/wsgi.py b/eventlet/wsgi.py index a62e509..7e3877e 100644 --- a/eventlet/wsgi.py +++ b/eventlet/wsgi.py @@ -33,7 +33,7 @@ from eventlet.green import socket from eventlet.green import BaseHTTPServer from eventlet import api -from eventlet import coropool +from eventlet import pool DEFAULT_MAX_SIMULTANEOUS_REQUESTS = 1024 @@ -380,7 +380,7 @@ def server(sock, site, log=None, environ=None, max_size=None, max_http_version=D server_event.send(serv) if max_size is None: max_size = DEFAULT_MAX_SIMULTANEOUS_REQUESTS - pool = coropool.Pool(max_size=max_size) + pool = pool.Pool(max_size=max_size) try: host, port = sock.getsockname() port = ':%s' % (port, ) diff --git a/greentest/saranwrap_test.py b/greentest/saranwrap_test.py index ed45b6d..d44254f 100644 --- a/greentest/saranwrap_test.py +++ b/greentest/saranwrap_test.py @@ -22,7 +22,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from eventlet import api, saranwrap, coropool +from eventlet import api, saranwrap, pool import os import sys @@ -292,7 +292,7 @@ sys_path = sys.path""") from greentest import saranwrap_test prox = saranwrap.wrap(saranwrap_test) - pool = coropool.Pool(max_size=4) + pool = pool.Pool(max_size=4) waiters = [] waiters.append(pool.execute(lambda: self.assertEquals(prox.one, 1))) waiters.append(pool.execute(lambda: self.assertEquals(prox.two, 2))) diff --git a/greentest/test__coropool.py b/greentest/test__pool.py similarity index 96% rename from greentest/test__coropool.py rename to greentest/test__pool.py index 26293a4..b9be4ae 100644 --- a/greentest/test__coropool.py +++ b/greentest/test__pool.py @@ -1,10 +1,10 @@ import sys -from eventlet import coropool, coros, api +from eventlet import pool, coros, api from greentest import LimitedTestCase from unittest import main class TestCoroutinePool(LimitedTestCase): - klass = coropool.Pool + klass = pool.Pool def test_execute_async(self): done = coros.event() @@ -74,7 +74,7 @@ class TestCoroutinePool(LimitedTestCase): class PoolBasicTests(LimitedTestCase): - klass = coropool.Pool + klass = pool.Pool def test_execute_async(self): p = self.klass(max_size=2)