diff options
author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-03-30 10:22:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-30 10:22:23 +0200 |
commit | 7330408ac36f893a4a11c668ba230b440ec09f41 (patch) | |
tree | fb928c361adf71a85dc7efe5c4fdf33b2611cff6 /django | |
parent | b347dc63d5468564cbb7050461565f4f89032664 (diff) | |
download | django-7330408ac36f893a4a11c668ba230b440ec09f41.tar.gz |
Reverted "Refs #31949 -- Enabled @sensitive_variables to work with async functions."
This reverts commits 23cbed21876bf02f4600c0dac3a5277db5b2afbb and
203a15cadbf8d03b51df1b28d89b2e7ab4264973.
Diffstat (limited to 'django')
-rw-r--r-- | django/views/decorators/debug.py | 72 |
1 files changed, 20 insertions, 52 deletions
diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py index 3f68d4a7e5..5578a4995f 100644 --- a/django/views/decorators/debug.py +++ b/django/views/decorators/debug.py @@ -1,7 +1,5 @@ from functools import wraps -from asgiref.sync import iscoroutinefunction - from django.http import HttpRequest @@ -35,25 +33,13 @@ def sensitive_variables(*variables): ) def decorator(func): - if iscoroutinefunction(func): - - @wraps(func) - async def sensitive_variables_wrapper(*func_args, **func_kwargs): - if variables: - sensitive_variables_wrapper.sensitive_variables = variables - else: - sensitive_variables_wrapper.sensitive_variables = "__ALL__" - return await func(*func_args, **func_kwargs) - - else: - - @wraps(func) - def sensitive_variables_wrapper(*func_args, **func_kwargs): - if variables: - sensitive_variables_wrapper.sensitive_variables = variables - else: - sensitive_variables_wrapper.sensitive_variables = "__ALL__" - return func(*func_args, **func_kwargs) + @wraps(func) + def sensitive_variables_wrapper(*func_args, **func_kwargs): + if variables: + sensitive_variables_wrapper.sensitive_variables = variables + else: + sensitive_variables_wrapper.sensitive_variables = "__ALL__" + return func(*func_args, **func_kwargs) return sensitive_variables_wrapper @@ -91,37 +77,19 @@ def sensitive_post_parameters(*parameters): ) def decorator(view): - if iscoroutinefunction(view): - - @wraps(view) - async def sensitive_post_parameters_wrapper(request, *args, **kwargs): - if not isinstance(request, HttpRequest): - raise TypeError( - "sensitive_post_parameters didn't receive an HttpRequest " - "object. If you are decorating a classmethod, make sure " - "to use @method_decorator." - ) - if parameters: - request.sensitive_post_parameters = parameters - else: - request.sensitive_post_parameters = "__ALL__" - return await view(request, *args, **kwargs) - - else: - - @wraps(view) - def sensitive_post_parameters_wrapper(request, *args, **kwargs): - if not isinstance(request, HttpRequest): - raise TypeError( - "sensitive_post_parameters didn't receive an HttpRequest " - "object. If you are decorating a classmethod, make sure " - "to use @method_decorator." - ) - if parameters: - request.sensitive_post_parameters = parameters - else: - request.sensitive_post_parameters = "__ALL__" - return view(request, *args, **kwargs) + @wraps(view) + def sensitive_post_parameters_wrapper(request, *args, **kwargs): + if not isinstance(request, HttpRequest): + raise TypeError( + "sensitive_post_parameters didn't receive an HttpRequest " + "object. If you are decorating a classmethod, make sure " + "to use @method_decorator." + ) + if parameters: + request.sensitive_post_parameters = parameters + else: + request.sensitive_post_parameters = "__ALL__" + return view(request, *args, **kwargs) return sensitive_post_parameters_wrapper |