openstack/deb-python-eventlet
Code Issues Proposed changes

rename eventlet.coropool to eventlet.pool

Browse Source
This commit is contained in:
Denis Bilenko
2009-05-24 18:34:48 +07:00
parent 2ca055a66c
commit 044ab87750
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eventlet/httpd.py
View File

@@ -39,7 +39,7 @@ except ImportError:
from StringIO import StringIO from StringIO import StringIO
from eventlet import api from eventlet import api
from eventlet import coropool from eventlet import pool
DEFAULT_MAX_HTTP_VERSION = 'HTTP/1.1' 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): 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: if serv is None:
serv = Server(sock, sock.getsockname(), site, log, max_http_version=max_http_version) serv = Server(sock, sock.getsockname(), site, log, max_http_version=max_http_version)
try: try:

0
eventlet/coropool.py → eventlet/pool.py
View File

4
eventlet/wsgi.py
View File

@@ -33,7 +33,7 @@ from eventlet.green import socket
from eventlet.green import BaseHTTPServer from eventlet.green import BaseHTTPServer
from eventlet import api from eventlet import api
from eventlet import coropool from eventlet import pool
DEFAULT_MAX_SIMULTANEOUS_REQUESTS = 1024 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) server_event.send(serv)
if max_size is None: if max_size is None:
max_size = DEFAULT_MAX_SIMULTANEOUS_REQUESTS max_size = DEFAULT_MAX_SIMULTANEOUS_REQUESTS
pool = coropool.Pool(max_size=max_size) pool = pool.Pool(max_size=max_size)
try: try:
host, port = sock.getsockname() host, port = sock.getsockname()
port = ':%s' % (port, ) port = ':%s' % (port, )

4
greentest/saranwrap_test.py
View File

@@ -22,7 +22,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE. # THE SOFTWARE.
from eventlet import api, saranwrap, coropool from eventlet import api, saranwrap, pool
import os import os
import sys import sys
@@ -292,7 +292,7 @@ sys_path = sys.path""")
from greentest import saranwrap_test from greentest import saranwrap_test
prox = saranwrap.wrap(saranwrap_test) prox = saranwrap.wrap(saranwrap_test)
pool = coropool.Pool(max_size=4) pool = pool.Pool(max_size=4)
waiters = [] waiters = []
waiters.append(pool.execute(lambda: self.assertEquals(prox.one, 1))) waiters.append(pool.execute(lambda: self.assertEquals(prox.one, 1)))
waiters.append(pool.execute(lambda: self.assertEquals(prox.two, 2))) waiters.append(pool.execute(lambda: self.assertEquals(prox.two, 2)))

6
greentest/test__coropool.py → greentest/test__pool.py
View File

@@ -1,10 +1,10 @@
import sys import sys
from eventlet import coropool, coros, api from eventlet import pool, coros, api
from greentest import LimitedTestCase from greentest import LimitedTestCase
from unittest import main from unittest import main
class TestCoroutinePool(LimitedTestCase): class TestCoroutinePool(LimitedTestCase):
klass = coropool.Pool klass = pool.Pool
def test_execute_async(self): def test_execute_async(self):
done = coros.event() done = coros.event()
@@ -74,7 +74,7 @@ class TestCoroutinePool(LimitedTestCase):
class PoolBasicTests(LimitedTestCase): class PoolBasicTests(LimitedTestCase):
klass = coropool.Pool klass = pool.Pool
def test_execute_async(self): def test_execute_async(self):
p = self.klass(max_size=2) p = self.klass(max_size=2)