Skip to content

Do not ignore _globalns that is set via inject() #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sobolevn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not ignore _globalns that is set via inject() #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions rodi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ def _get_obj_locals(obj) -> Optional[Dict[str, Any]]:
return getattr(obj, "_locals", None)


def _get_obj_globals(obj) -> Dict[str, Any]:
return getattr(obj, "_globals", {})


def class_name(input_type):
if input_type in {list, set} and str( # noqa: E721
type(input_type) == "<class 'types.GenericAlias'>"
Expand Down Expand Up @@ -544,9 +548,11 @@ def _resolve_by_init_method(self, context: ResolutionContext):

if sys.version_info >= (3, 10): # pragma: no cover
# Python 3.10
globalns = vars(sys.modules[self.concrete_type.__module__])
globalns.update(_get_obj_globals(self.concrete_type))
annotations = get_type_hints(
self.concrete_type.__init__,
vars(sys.modules[self.concrete_type.__module__]),
globalns,
_get_obj_locals(self.concrete_type),
)
for key, value in params.items():
Expand Down Expand Up @@ -623,9 +629,11 @@ def __call__(self, context: ResolutionContext):
chain.append(concrete_type)

if self._has_default_init():
globalns = vars(sys.modules[concrete_type.__module__])
globalns.update(_get_obj_locals(concrete_type))
annotations = get_type_hints(
concrete_type,
vars(sys.modules[concrete_type.__module__]),
globalns,
_get_obj_locals(concrete_type),
)

Expand Down