ets-labs/python-dependency-injector
1
1
Fork 0
mirror of https://github.com/ets-labs/python-dependency-injector.git synced 2025-07-18 03:52:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix: robust Annotated detection for wiring across Python versions

Browse Source
This commit is contained in:
Roman Mogylatov 2025-05-21 13:58:35 -04:00
parent c2619cc43f
commit 164a45cd82
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dependency_injector/wiring.py
View File

@ -578,8 +578,13 @@ def _unpatch_attribute(patched: PatchedAttribute) -> None:
def _extract_marker(parameter: inspect.Parameter) -> Optional["_Marker"]: def _extract_marker(parameter: inspect.Parameter) -> Optional["_Marker"]:
if get_origin(parameter.annotation) is Annotated: is_annotated = (
marker = get_args(parameter.annotation)[1] isinstance(annotation, type(Annotated))
and get_origin(annotation) is not None
and get_origin(annotation) is get_origin(Annotated)
)
if is_annotated:
marker = get_args(annotation)[1]
else: else:
marker = parameter.default marker = parameter.default
@ -1034,7 +1039,12 @@ def _get_members_and_annotated(obj: Any) -> Iterable[Tuple[str, Any]]:
except Exception: except Exception:
annotations = {} annotations = {}
for annotation_name, annotation in annotations.items(): for annotation_name, annotation in annotations.items():
if get_origin(annotation) is Annotated: is_annotated = (
isinstance(annotation, type(Annotated))
and get_origin(annotation) is not None
and get_origin(annotation) is get_origin(Annotated)
)
if is_annotated:
args = get_args(annotation) args = get_args(annotation)
if len(args) > 1: if len(args) > 1:
member = args[1] member = args[1]