diff options
| author | 93578237 <43147888+93578237@users.noreply.github.com> | 2026-02-09 16:06:50 -0500 |
|---|---|---|
| committer | Jacob Walls <jacobtylerwalls@gmail.com> | 2026-02-10 16:51:55 -0500 |
| commit | 56ed37e17e5b1a509aa68a0c797dcff34fcc1366 (patch) | |
| tree | d1f91ee3a83506992ccbd7994636e9b8d68314e9 /django/utils | |
| parent | 2c2d36376a0ce0edc048c077a60be6e3b953bb09 (diff) | |
Fixed #36903 -- Fixed further NameErrors when inspecting functions with deferred annotations.
Provide a wrapper for safe introspection of user functions on Python 3.14+.
Follow-up to 601914722956cc41f1f2c53972d669ddee6ffc04.
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/deprecation.py | 3 | ||||
| -rw-r--r-- | django/utils/inspect.py | 22 |
2 files changed, 14 insertions, 11 deletions
diff --git a/django/utils/deprecation.py b/django/utils/deprecation.py index 6b017cd917..daa485eb35 100644 --- a/django/utils/deprecation.py +++ b/django/utils/deprecation.py @@ -8,6 +8,7 @@ from inspect import iscoroutinefunction, markcoroutinefunction from asgiref.sync import sync_to_async import django +from django.utils.inspect import signature @functools.cache @@ -163,7 +164,7 @@ def deprecate_posargs(deprecation_warning, remappable_names, /): if isinstance(func, staticmethod): raise TypeError("Apply @staticmethod before @deprecate_posargs.") - params = inspect.signature(func).parameters + params = signature(func).parameters num_by_kind = Counter(param.kind for param in params.values()) if num_by_kind[inspect.Parameter.VAR_POSITIONAL] > 0: diff --git a/django/utils/inspect.py b/django/utils/inspect.py index f0f43ae17e..a04669fc11 100644 --- a/django/utils/inspect.py +++ b/django/utils/inspect.py @@ -17,16 +17,7 @@ if PY314: @functools.lru_cache(maxsize=512) def _get_func_parameters(func, remove_first): - # As the annotations are not used in any case, inspect the signature with - # FORWARDREF to leave any deferred annotations unevaluated. - if PY314: - signature = inspect.signature( - func, annotation_format=annotationlib.Format.FORWARDREF - ) - else: - signature = inspect.signature(func) - - parameters = tuple(signature.parameters.values()) + parameters = tuple(signature(func).parameters.values()) if remove_first: parameters = parameters[1:] return parameters @@ -130,3 +121,14 @@ def lazy_annotations(): yield finally: inspect._signature_from_callable = original_helper + + +def signature(obj): + """ + A wrapper around inspect.signature that leaves deferred annotations + unevaluated on Python 3.14+, since they are not used in our case. + """ + if PY314: + return inspect.signature(obj, annotation_format=annotationlib.Format.FORWARDREF) + else: + return inspect.signature(obj) |
