diff --git a/eventlet/wsgi.py b/eventlet/wsgi.py index 7e3877e..85b6b33 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 pool +from eventlet.pool 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 = pool.Pool(max_size=max_size) + 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 d44254f..7ac229b 100644 --- a/greentest/saranwrap_test.py +++ b/greentest/saranwrap_test.py @@ -22,7 +22,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -from eventlet import api, saranwrap, pool +from eventlet import api, saranwrap +from eventlet.pool import Pool import os import sys @@ -292,7 +293,7 @@ sys_path = sys.path""") from greentest import saranwrap_test prox = saranwrap.wrap(saranwrap_test) - pool = pool.Pool(max_size=4) + 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)))