diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/async/tests.py | 4 | ||||
| -rw-r--r-- | tests/deprecation/test_middleware_mixin.py | 7 | ||||
| -rw-r--r-- | tests/middleware_exceptions/middleware.py | 7 | ||||
| -rw-r--r-- | tests/requirements/py3.txt | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/tests/async/tests.py b/tests/async/tests.py index 559f21b8b1..6ca5c989b0 100644 --- a/tests/async/tests.py +++ b/tests/async/tests.py @@ -2,7 +2,7 @@ import asyncio import os from unittest import mock -from asgiref.sync import async_to_sync +from asgiref.sync import async_to_sync, iscoroutinefunction from django.core.cache import DEFAULT_CACHE_ALIAS, caches from django.core.exceptions import ImproperlyConfigured, SynchronousOnlyOperation @@ -84,7 +84,7 @@ class ViewTests(SimpleTestCase): with self.subTest(view_cls=view_cls, is_async=is_async): self.assertIs(view_cls.view_is_async, is_async) callback = view_cls.as_view() - self.assertIs(asyncio.iscoroutinefunction(callback), is_async) + self.assertIs(iscoroutinefunction(callback), is_async) def test_mixed_views_raise_error(self): class MixedView(View): diff --git a/tests/deprecation/test_middleware_mixin.py b/tests/deprecation/test_middleware_mixin.py index 060c2f5f35..3b6ad6d8ee 100644 --- a/tests/deprecation/test_middleware_mixin.py +++ b/tests/deprecation/test_middleware_mixin.py @@ -1,7 +1,6 @@ -import asyncio import threading -from asgiref.sync import async_to_sync +from asgiref.sync import async_to_sync, iscoroutinefunction from django.contrib.admindocs.middleware import XViewMiddleware from django.contrib.auth.middleware import ( @@ -101,11 +100,11 @@ class MiddlewareMixinTests(SimpleTestCase): # Middleware appears as coroutine if get_function is # a coroutine. middleware_instance = middleware(async_get_response) - self.assertIs(asyncio.iscoroutinefunction(middleware_instance), True) + self.assertIs(iscoroutinefunction(middleware_instance), True) # Middleware doesn't appear as coroutine if get_function is not # a coroutine. middleware_instance = middleware(sync_get_response) - self.assertIs(asyncio.iscoroutinefunction(middleware_instance), False) + self.assertIs(iscoroutinefunction(middleware_instance), False) def test_sync_to_async_uses_base_thread_and_connection(self): """ diff --git a/tests/middleware_exceptions/middleware.py b/tests/middleware_exceptions/middleware.py index 5a0c82afb1..f50aa61327 100644 --- a/tests/middleware_exceptions/middleware.py +++ b/tests/middleware_exceptions/middleware.py @@ -1,4 +1,4 @@ -import asyncio +from asgiref.sync import iscoroutinefunction, markcoroutinefunction from django.http import Http404, HttpResponse from django.template import engines @@ -15,9 +15,8 @@ log = [] class BaseMiddleware: def __init__(self, get_response): self.get_response = get_response - if asyncio.iscoroutinefunction(self.get_response): - # Mark the class as async-capable. - self._is_coroutine = asyncio.coroutines._is_coroutine + if iscoroutinefunction(self.get_response): + markcoroutinefunction(self) def __call__(self, request): return self.get_response(request) diff --git a/tests/requirements/py3.txt b/tests/requirements/py3.txt index 6a88d17a8f..89209ca9e6 100644 --- a/tests/requirements/py3.txt +++ b/tests/requirements/py3.txt @@ -1,5 +1,5 @@ aiosmtpd -asgiref >= 3.5.2 +asgiref >= 3.6.0 argon2-cffi >= 16.1.0 backports.zoneinfo; python_version < '3.9' bcrypt |