1795 rename async module

.gitignore

@@ -15,3 +15,5 @@ examples/frameworks/pylonstest/pylonstest.egg-info/
 MANIFEST
 nohup.out
 setuptools-*
+.cache
+.eggs

THANKS

@@ -49,6 +49,7 @@ Dariusz Suchojad <[email protected]>
 David Vincelli <[email protected]>
 David Wolever <[email protected]>
 Denis Bilenko <[email protected]>
+Diego Oliveira <[email protected]>
 Dima Barsky <[email protected]>
 Djoume Salvetti <[email protected]>
 Dmitry Medvinsky <[email protected]>

docs/source/news.rst

@@ -2,6 +2,14 @@
 Changelog
 =========
 
+19.9.0 / 2018/05/26
+===================
+
+- the internal module `gunicorn.workers.async` was renamed to `gunicorn.workers.async`
+  since ``async`` is now a reserved word in Python 3.7
+  (:pr:`1527`)
+
+
 19.8.1 / 2018/04/30
 ===================
 

gunicorn/workers/__init__.py

@@ -17,6 +17,6 @@
 }
 
 
-if sys.version_info >= (3, 3):
+if sys.version_info >= (3, 4):
     # gaiohttp worker can be used with Python 3.3+ only.
     SUPPORTED_WORKERS["gaiohttp"] = "gunicorn.workers.gaiohttp.AiohttpWorker"

gunicorn/workers/_gaiohttp.py

@@ -46,7 +46,7 @@ def init_process(self):
         super().init_process()
 
     def run(self):
-        self._runner = asyncio.async(self._run(), loop=self.loop)
+        self._runner = asyncio.ensure_future(self._run(), loop=self.loop)
 
         try:
             self.loop.run_until_complete(self._runner)

gunicorn/workers/geventlet.py

@@ -24,7 +24,7 @@
 import greenlet
 
 from gunicorn.http.wsgi import sendfile as o_sendfile
-from gunicorn.workers.async import AsyncWorker
+from gunicorn.workers._async import AsyncWorker
 
 def _eventlet_sendfile(fdout, fdin, offset, nbytes):
     while True:

gunicorn/workers/ggevent.py

@@ -27,7 +27,7 @@
 
 import gunicorn
 from gunicorn.http.wsgi import base_environ
-from gunicorn.workers.async import AsyncWorker
+from gunicorn.workers._async import AsyncWorker
 from gunicorn.http.wsgi import sendfile as o_sendfile
 
 VERSION = "gevent/%s gunicorn/%s" % (gevent.__version__, gunicorn.__version__)

requirements_test.txt

@@ -1,3 +1,3 @@
 coverage>=4.0,<4.4  # TODO: https://github.com/benoitc/gunicorn/issues/1548
-pytest==3.0.5
-pytest-cov==2.4.0
+pytest
+pytest-cov

tests/test_gaiohttp.py

@@ -50,7 +50,7 @@ def test_run(self, m_asyncio):
         self.worker.loop = mock.Mock()
         self.worker.run()
 
-        self.assertTrue(m_asyncio.async.called)
+        self.assertTrue(m_asyncio.ensure_future.called)
         self.assertTrue(self.worker.loop.run_until_complete.called)
         self.assertTrue(self.worker.loop.close.called)