mirror of
https://github.com/frappe/gunicorn.git
synced 2026-01-14 11:09:11 +08:00
Merge pull request #1796 from diegoholiveira/1795-rename-async-module
1795 rename async module
This commit is contained in:
commit
bd833e0009
1
THANKS
1
THANKS
@ -49,6 +49,7 @@ Dariusz Suchojad <dsuch-github@m.zato.io>
|
|||||||
David Vincelli <david@freshbooks.com>
|
David Vincelli <david@freshbooks.com>
|
||||||
David Wolever <david@wolever.net>
|
David Wolever <david@wolever.net>
|
||||||
Denis Bilenko <denis.bilenko@gmail.com>
|
Denis Bilenko <denis.bilenko@gmail.com>
|
||||||
|
Diego Oliveira <contact@diegoholiveira.com>
|
||||||
Dima Barsky <github@kappa.ac93.org>
|
Dima Barsky <github@kappa.ac93.org>
|
||||||
Djoume Salvetti <djoume@freshbooks.com>
|
Djoume Salvetti <djoume@freshbooks.com>
|
||||||
Dmitry Medvinsky <me@dmedvinsky.name>
|
Dmitry Medvinsky <me@dmedvinsky.name>
|
||||||
|
|||||||
@ -8,6 +8,9 @@ Changelog
|
|||||||
- fix: prevent raising :exc:`AttributeError` when ``--reload`` is not passed
|
- fix: prevent raising :exc:`AttributeError` when ``--reload`` is not passed
|
||||||
in case of a :exc:`SyntaxError` raised from the WSGI application.
|
in case of a :exc:`SyntaxError` raised from the WSGI application.
|
||||||
(:issue:`1805`, :pr:`1806`)
|
(:issue:`1805`, :pr:`1806`)
|
||||||
|
- The internal module ``gunicorn.workers.async`` was renamed to ``gunicorn.workers.base_async``
|
||||||
|
since ``async`` is now a reserved word in Python 3.7.
|
||||||
|
(:pr:`1527`)
|
||||||
|
|
||||||
19.8.1 / 2018/04/30
|
19.8.1 / 2018/04/30
|
||||||
===================
|
===================
|
||||||
|
|||||||
@ -17,6 +17,6 @@ SUPPORTED_WORKERS = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if sys.version_info >= (3, 3):
|
if sys.version_info >= (3, 4):
|
||||||
# gaiohttp worker can be used with Python 3.3+ only.
|
# gaiohttp worker can be used with Python 3.4+ only.
|
||||||
SUPPORTED_WORKERS["gaiohttp"] = "gunicorn.workers.gaiohttp.AiohttpWorker"
|
SUPPORTED_WORKERS["gaiohttp"] = "gunicorn.workers.gaiohttp.AiohttpWorker"
|
||||||
|
|||||||
@ -46,7 +46,7 @@ class AiohttpWorker(base.Worker):
|
|||||||
super().init_process()
|
super().init_process()
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
self._runner = asyncio.async(self._run(), loop=self.loop)
|
self._runner = asyncio.ensure_future(self._run(), loop=self.loop)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.loop.run_until_complete(self._runner)
|
self.loop.run_until_complete(self._runner)
|
||||||
|
|||||||
@ -24,7 +24,7 @@ from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED
|
|||||||
import greenlet
|
import greenlet
|
||||||
|
|
||||||
from gunicorn.http.wsgi import sendfile as o_sendfile
|
from gunicorn.http.wsgi import sendfile as o_sendfile
|
||||||
from gunicorn.workers.async import AsyncWorker
|
from gunicorn.workers.base_async import AsyncWorker
|
||||||
|
|
||||||
def _eventlet_sendfile(fdout, fdin, offset, nbytes):
|
def _eventlet_sendfile(fdout, fdin, offset, nbytes):
|
||||||
while True:
|
while True:
|
||||||
|
|||||||
@ -27,7 +27,7 @@ from gevent import pywsgi
|
|||||||
|
|
||||||
import gunicorn
|
import gunicorn
|
||||||
from gunicorn.http.wsgi import base_environ
|
from gunicorn.http.wsgi import base_environ
|
||||||
from gunicorn.workers.async import AsyncWorker
|
from gunicorn.workers.base_async import AsyncWorker
|
||||||
from gunicorn.http.wsgi import sendfile as o_sendfile
|
from gunicorn.http.wsgi import sendfile as o_sendfile
|
||||||
|
|
||||||
VERSION = "gevent/%s gunicorn/%s" % (gevent.__version__, gunicorn.__version__)
|
VERSION = "gevent/%s gunicorn/%s" % (gevent.__version__, gunicorn.__version__)
|
||||||
|
|||||||
@ -50,7 +50,7 @@ class WorkerTests(unittest.TestCase):
|
|||||||
self.worker.loop = mock.Mock()
|
self.worker.loop = mock.Mock()
|
||||||
self.worker.run()
|
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.run_until_complete.called)
|
||||||
self.assertTrue(self.worker.loop.close.called)
|
self.assertTrue(self.worker.loop.close.called)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user