ets-labs/python-dependency-injector
1
1
Fork 0
mirror of https://github.com/ets-labs/python-dependency-injector.git synced 2025-02-23 15:10:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve providers copying

Browse Source
This commit is contained in:
Roman Mogylatov 2021-03-20 16:28:41 -04:00
parent a94b141a8f
commit 989aaecd6d
4 changed files with 8630 additions and 8605 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1072
src/dependency_injector/containers.c
View File

File diff suppressed because it is too large Load Diff

8
src/dependency_injector/containers.pyx
View File

@ -88,14 +88,14 @@ class DynamicContainer(Container):
copied = self.__class__() copied = self.__class__()
memo[id(self)] = copied memo[id(self)] = copied
copied.provider_type = providers.Provider
copied.overridden = providers.deepcopy(self.overridden, memo)
copied.declarative_parent = self.declarative_parent
copied.__self__ = providers.deepcopy(self.__self__, memo) copied.__self__ = providers.deepcopy(self.__self__, memo)
for name in copied.__self__.alt_names: for name in copied.__self__.alt_names:
copied.set_provider(name, copied.__self__) copied.set_provider(name, copied.__self__)
copied.provider_type = providers.Provider
copied.overridden = providers.deepcopy(self.overridden, memo)
copied.declarative_parent = self.declarative_parent
for name, provider in providers.deepcopy(self.providers, memo).items(): for name, provider in providers.deepcopy(self.providers, memo).items():
copied.set_provider(name, provider) copied.set_provider(name, provider)

16019
src/dependency_injector/providers.c
View File

File diff suppressed because it is too large Load Diff

136
src/dependency_injector/providers.pyx
View File

@ -209,10 +209,8 @@ cdef class Provider(object):
if copied is not None: if copied is not None:
return copied return copied
copied = self.__class__() copied = _memorized_duplicate(self, memo)
self._copy_overridings(copied, memo) self._copy_overridings(copied, memo)
return copied return copied
@classmethod @classmethod
@ -502,14 +500,10 @@ cdef class Self(Provider):
if copied is not None: if copied is not None:
return copied return copied
copied = self.__class__() copied = _memorized_duplicate(self, memo)
memo[id(self)] = copied
copied.set_container(deepcopy(self.__container, memo)) copied.set_container(deepcopy(self.__container, memo))
copied.set_alt_names(self.__alt_names) copied.set_alt_names(self.__alt_names)
self._copy_overridings(copied, memo) self._copy_overridings(copied, memo)
return copied return copied
def __str__(self): def __str__(self):
@ -562,13 +556,8 @@ cdef class Delegate(Provider):
if copied is not None: if copied is not None:
return copied return copied
provides = self.provides
if provides:
provides = deepcopy(self.provides, memo)
copied = _memorized_duplicate(self, memo) copied = _memorized_duplicate(self, memo)
copied.set_provides(provides) copied.set_provides(_copy_if_provider(self.provides, memo))
self._copy_overridings(copied, memo) self._copy_overridings(copied, memo)
return copied return copied
@ -910,12 +899,9 @@ cdef class DependenciesContainer(Object):
if copied is not None: if copied is not None:
return copied return copied
copied = self.__class__() copied = <DependenciesContainer> _memorized_duplicate(self, memo)
memo[id(self)] = copied
copied.__provides = deepcopy(self.__provides, memo) copied.__provides = deepcopy(self.__provides, memo)
copied.__providers = deepcopy(self.__providers, memo) copied.__providers = deepcopy(self.__providers, memo)
self._copy_parent(copied, memo) self._copy_parent(copied, memo)
self._copy_overridings(copied, memo) self._copy_overridings(copied, memo)
@ -1082,17 +1068,11 @@ cdef class Callable(Provider):
if copied is not None: if copied is not None:
return copied return copied
provides = self.provides
if isinstance(provides, Provider):
provides = deepcopy(provides, memo)
copied = _memorized_duplicate(self, memo) copied = _memorized_duplicate(self, memo)
copied.set_provides(provides) copied.set_provides(_copy_if_provider(self.provides, memo))
copied.set_args(*deepcopy(self.args, memo)) copied.set_args(*deepcopy(self.args, memo))
copied.set_kwargs(**deepcopy(self.kwargs, memo)) copied.set_kwargs(**deepcopy(self.kwargs, memo))
self._copy_overridings(copied, memo) self._copy_overridings(copied, memo)
return copied return copied
def __str__(self): def __str__(self):
@ -1403,7 +1383,7 @@ cdef class ConfigurationOption(Provider):
:py:class:`Configuration` provider. :py:class:`Configuration` provider.
""" """
def __init__(self, name, Configuration root, required=False): def __init__(self, name=None, Configuration root=None, required=False):
self.__name = name self.__name = name
self.__root = root self.__root = root
self.__children = {} self.__children = {}
@ -1418,12 +1398,12 @@ cdef class ConfigurationOption(Provider):
if copied is not None: if copied is not None:
return copied return copied
copied_name = deepcopy(self.__name, memo) copied = <ConfigurationOption> _memorized_duplicate(self, memo)
copied_root = deepcopy(self.__root, memo) copied.__name = deepcopy(self.__name, memo)
copied.__root = deepcopy(self.__root, memo)
copied = self.__class__(copied_name, copied_root, self.__required)
copied.__children = deepcopy(self.__children, memo) copied.__children = deepcopy(self.__children, memo)
copied.__required = self.__required
self._copy_overridings(copied, memo)
return copied return copied
def __enter__(self): def __enter__(self):
@ -2176,18 +2156,12 @@ cdef class Factory(Provider):
if copied is not None: if copied is not None:
return copied return copied
provides = self.provides
if isinstance(provides, Provider):
provides = deepcopy(provides, memo)
copied = _memorized_duplicate(self, memo) copied = _memorized_duplicate(self, memo)
copied.set_provides(provides) copied.set_provides(_copy_if_provider(self.provides, memo))
copied.set_args(*deepcopy(self.args, memo)) copied.set_args(*deepcopy(self.args, memo))
copied.set_kwargs(**deepcopy(self.kwargs, memo)) copied.set_kwargs(**deepcopy(self.kwargs, memo))
copied.set_attributes(**deepcopy(self.attributes, memo)) copied.set_attributes(**deepcopy(self.attributes, memo))
self._copy_overridings(copied, memo) self._copy_overridings(copied, memo)
return copied return copied
def __str__(self): def __str__(self):
@ -2551,18 +2525,12 @@ cdef class BaseSingleton(Provider):
if copied is not None: if copied is not None:
return copied return copied
provides = self.provides
if isinstance(provides, Provider):
provides = deepcopy(provides, memo)
copied = _memorized_duplicate(self, memo) copied = _memorized_duplicate(self, memo)
copied.set_provides(provides) copied.set_provides(_copy_if_provider(self.provides, memo))
copied.set_args(*deepcopy(self.args, memo)) copied.set_args(*deepcopy(self.args, memo))
copied.set_kwargs(**deepcopy(self.kwargs, memo)) copied.set_kwargs(**deepcopy(self.kwargs, memo))
copied.set_attributes(**deepcopy(self.attributes, memo)) copied.set_attributes(**deepcopy(self.attributes, memo))
self._copy_overridings(copied, memo) self._copy_overridings(copied, memo)
return copied return copied
@property @property
@ -3090,9 +3058,9 @@ cdef class List(Provider):
if copied is not None: if copied is not None:
return copied return copied
copied = self.__class__(*deepcopy(self.args, memo)) copied = _memorized_duplicate(self, memo)
copied.set_args(*deepcopy(self.args, memo))
self._copy_overridings(copied, memo) self._copy_overridings(copied, memo)
return copied return copied
def __str__(self): def __str__(self):
@ -3198,9 +3166,9 @@ cdef class Dict(Provider):
if copied is not None: if copied is not None:
return copied return copied
copied = self.__class__(deepcopy(self.kwargs, memo)) copied = _memorized_duplicate(self, memo)
copied.set_kwargs(**deepcopy(self.kwargs, memo))
self._copy_overridings(copied, memo) self._copy_overridings(copied, memo)
return copied return copied
def __str__(self): def __str__(self):
@ -3622,12 +3590,12 @@ cdef class Container(Provider):
Provider is experimental. Its interface may change. Provider is experimental. Its interface may change.
""" """
def __init__(self, container_cls, container=None, **overriding_providers): def __init__(self, container_cls=None, container=None, **overriding_providers):
"""Initialize provider.""" """Initialize provider."""
self.__container_cls = container_cls self.__container_cls = container_cls
self.__overriding_providers = overriding_providers self.__overriding_providers = overriding_providers
if container is None: if container is None and container_cls:
container = container_cls() container = container_cls()
container.assign_parent(self) container.assign_parent(self)
self.__container = container self.__container = container
@ -3647,15 +3615,12 @@ cdef class Container(Provider):
if copied is not None: if copied is not None:
return copied return copied
copied = self.__class__(self.__container_cls, UNDEFINED) copied = <Container> _memorized_duplicate(self, memo)
memo[id(self)] = copied copied.__container_cls = self.__container_cls
copied.__container = deepcopy(self.__container, memo) copied.__container = deepcopy(self.__container, memo)
copied.__overriding_providers = deepcopy(self.__overriding_providers, memo) copied.__overriding_providers = deepcopy(self.__overriding_providers, memo)
copied.apply_overridings()
self._copy_parent(copied, memo) self._copy_parent(copied, memo)
self._copy_overridings(copied, memo)
return copied return copied
def __getattr__(self, name): def __getattr__(self, name):
@ -4277,13 +4242,13 @@ cdef class Injection(object):
cdef class PositionalInjection(Injection): cdef class PositionalInjection(Injection):
"""Positional injection class.""" """Positional injection class."""
def __init__(self, value): def __init__(self, value=None):
"""Initializer.""" """Initializer."""
self.__value = value self.__value = None
self.__is_provider = <int>is_provider(value) self.__is_provider = 0
self.__is_delegated = <int>is_delegated(value) self.__is_delegated = 0
self.__call = <int>(self.__is_provider == 1 and self.__call = 0
self.__is_delegated == 0) self.set(value)
super(PositionalInjection, self).__init__() super(PositionalInjection, self).__init__()
def __deepcopy__(self, memo): def __deepcopy__(self, memo):
@ -4291,7 +4256,9 @@ cdef class PositionalInjection(Injection):
copied = memo.get(id(self)) copied = memo.get(id(self))
if copied is not None: if copied is not None:
return copied return copied
return self.__class__(deepcopy(self.__value, memo)) copied = _memorized_duplicate(self, memo)
copied.set(_copy_if_provider(self.__value, memo))
return copied
def get_value(self): def get_value(self):
"""Return injection value.""" """Return injection value."""
@ -4301,18 +4268,28 @@ cdef class PositionalInjection(Injection):
"""Return original value.""" """Return original value."""
return self.__value return self.__value
def set(self, value):
"""Set injection."""
self.__value = value
self.__is_provider = <int>is_provider(value)
self.__is_delegated = <int>is_delegated(value)
self.__call = <int>(self.__is_provider == 1 and self.__is_delegated == 0)
cdef class NamedInjection(Injection): cdef class NamedInjection(Injection):
"""Keyword injection class.""" """Keyword injection class."""
def __init__(self, name, value): def __init__(self, name=None, value=None):
"""Initializer.""" """Initializer."""
self.__name = name self.__name = name
self.__value = value self.set_name(name)
self.__is_provider = <int>is_provider(value)
self.__is_delegated = <int>is_delegated(value) self.__value = None
self.__call = <int>(self.__is_provider == 1 and self.__is_provider = 0
self.__is_delegated == 0) self.__is_delegated = 0
self.__call = 0
self.set(value)
super(NamedInjection, self).__init__() super(NamedInjection, self).__init__()
def __deepcopy__(self, memo): def __deepcopy__(self, memo):
@ -4320,13 +4297,19 @@ cdef class NamedInjection(Injection):
copied = memo.get(id(self)) copied = memo.get(id(self))
if copied is not None: if copied is not None:
return copied return copied
return self.__class__(deepcopy(self.__name, memo), copied = _memorized_duplicate(self, memo)
deepcopy(self.__value, memo)) copied.set_name(self.get_name())
copied.set(_copy_if_provider(self.__value, memo))
return copied
def get_name(self): def get_name(self):
"""Return injection value.""" """Return injection name."""
return __get_name(self) return __get_name(self)
def set_name(self, name):
"""Set injection name."""
self.__name = name
def get_value(self): def get_value(self):
"""Return injection value.""" """Return injection value."""
return __get_value(self) return __get_value(self)
@ -4335,6 +4318,13 @@ cdef class NamedInjection(Injection):
"""Return original value.""" """Return original value."""
return self.__value return self.__value
def set(self, value):
"""Set injection."""
self.__value = value
self.__is_provider = <int>is_provider(value)
self.__is_delegated = <int>is_delegated(value)
self.__call = <int>(self.__is_provider == 1 and self.__is_delegated == 0)
@cython.boundscheck(False) @cython.boundscheck(False)
@cython.wraparound(False) @cython.wraparound(False)