rename eventlet.coropool to eventlet.pool

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:

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, )

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)))

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)