mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-03 15:06:09 +00:00
Code Issues 30 Releases Wiki Activity

Refs #35844 -- Used asgiref.sync.iscoroutinefunction() instead of deprecated asyncio.iscoroutinefunction().

Browse Source 
Fixes DeprecationWarning:

'asyncio.iscoroutinefunction' is deprecated and slated for removal in
Python 3.16; use inspect.iscoroutinefunction() instead.
This commit is contained in:
Mariusz Felisiak 2024-10-17 15:15:10 +02:00 committed by GitHub
parent 8b1a3a5643
commit bd3b1dfa24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/contrib/auth/decorators.py
View File

@ -1,8 +1,7 @@
import asyncio
from functools import wraps from functools import wraps
from urllib.parse import urlsplit from urllib.parse import urlsplit
from asgiref.sync import async_to_sync, sync_to_async from asgiref.sync import async_to_sync, iscoroutinefunction, sync_to_async
from django.conf import settings from django.conf import settings
from django.contrib.auth import REDIRECT_FIELD_NAME from django.contrib.auth import REDIRECT_FIELD_NAME
@ -35,11 +34,11 @@ def user_passes_test(
return redirect_to_login(path, resolved_login_url, redirect_field_name) return redirect_to_login(path, resolved_login_url, redirect_field_name)
if asyncio.iscoroutinefunction(view_func): if iscoroutinefunction(view_func):
async def _view_wrapper(request, *args, **kwargs): async def _view_wrapper(request, *args, **kwargs):
auser = await request.auser() auser = await request.auser()
if asyncio.iscoroutinefunction(test_func): if iscoroutinefunction(test_func):
test_pass = await test_func(auser) test_pass = await test_func(auser)
else: else:
test_pass = await sync_to_async(test_func)(auser) test_pass = await sync_to_async(test_func)(auser)
@ -51,7 +50,7 @@ def user_passes_test(
else: else:
def _view_wrapper(request, *args, **kwargs): def _view_wrapper(request, *args, **kwargs):
if asyncio.iscoroutinefunction(test_func): if iscoroutinefunction(test_func):
test_pass = async_to_sync(test_func)(request.user) test_pass = async_to_sync(test_func)(request.user)
else: else:
test_pass = test_func(request.user) test_pass = test_func(request.user)
@ -107,7 +106,7 @@ def permission_required(perm, login_url=None, raise_exception=False):
perms = perm perms = perm
def decorator(view_func): def decorator(view_func):
if asyncio.iscoroutinefunction(view_func): if iscoroutinefunction(view_func):
async def check_perms(user): async def check_perms(user):
# First check if the user has the permission (even anon users). # First check if the user has the permission (even anon users).

2
tests/auth_tests/test_decorators.py
View File

@ -1,4 +1,4 @@
from asyncio import iscoroutinefunction from asgiref.sync import iscoroutinefunction
from django.conf import settings from django.conf import settings
from django.contrib.auth import models from django.contrib.auth import models