More appropriate name for coroutine module

3 files changed, 7 insertions, 7 deletions

diff --git a/restful_document/subscribe_socket.py b/restful_document/subscribe_socket.py
index b73ce78..bd1e578 100644
--- a/restful_document/subscribe_socket.py
+++ b/restful_document/subscribe_socket.py
@@ -20,7 +20,7 @@ from gettext import gettext as _
 
 from restful_document import env
 from restful_document.sockets import SocketFile, BUFFER_SIZE
-from active_document import greenlet, util, enforce
+from active_document import coroutine, util, enforce
 
 
 _logger = logging.getLogger('restful_document.subscribe_socket')
@@ -48,13 +48,13 @@ class SubscribeSocket(object):
         _logger.info(_('Listening for subscriptions on %s port'),
                 env.subscribe_port.value)
 
-        conn = greenlet.socket(socket.AF_INET, socket.SOCK_STREAM)
+        conn = coroutine.socket(socket.AF_INET, socket.SOCK_STREAM)
         # pylint: disable-msg=E1101
         conn.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         conn.bind((env.host.value, env.subscribe_port.value))
         conn.listen(5)
 
-        self._server = greenlet.Server(conn, self._serve_client)
+        self._server = coroutine.Server(conn, self._serve_client)
         try:
             env.subscriber = self
             self._server.serve_forever()
diff --git a/tests/__init__.py b/tests/__init__.py
index 66f4347..bfb2f65 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -17,7 +17,7 @@ import requests
 from M2Crypto import DSA
 
 import active_document as ad
-from active_document import greenlet
+from active_document import coroutine
 from restful_document import env as _env
 from restful_document.router import Router
 from restful_document.subscribe_socket import SubscribeSocket
@@ -124,7 +124,7 @@ class Test(unittest.TestCase):
         logging.basicConfig(level=logging.DEBUG, filename=tmpdir + '-%s.http.log' % self.httpd_seqno)
 
         volume = ad.SingleVolume(tmpdir + '/db', classes)
-        httpd = greenlet.WSGIServer(('localhost', port), Router(volume))
+        httpd = coroutine.WSGIServer(('localhost', port), Router(volume))
         subscriber = SubscribeSocket(volume)
         try:
             gevent.joinall([
diff --git a/tests/units/subscribe_socket.py b/tests/units/subscribe_socket.py
index 70777c0..5f4ec25 100755
--- a/tests/units/subscribe_socket.py
+++ b/tests/units/subscribe_socket.py
@@ -9,7 +9,7 @@ from tests import Resource
 
 import active_document as ad
 
-from active_document import greenlet
+from active_document import coroutine
 from restful_document import env
 from restful_document.sockets import SocketFile
 
@@ -17,7 +17,7 @@ from restful_document.sockets import SocketFile
 class SubscribeSocketTest(tests.Test):
 
     def subscribe(self, host, port, ticket):
-        conn = greenlet.socket()
+        conn = coroutine.socket()
         conn.connect((host, port))
         result = SocketFile(conn)
         result.write_message({'ticket': ticket})