Merge branch 'release/4.29.1' into master

This commit is contained in:
Roman Mogylatov 2021-03-05 17:28:56 -05:00
commit 6b57ce9f15
8 changed files with 6251 additions and 6008 deletions

View File

@ -1,3 +0,0 @@
.rst-content .highlight>pre, .rst-content .linenodiv>pre {
line-height: normal;
}

View File

@ -7,6 +7,14 @@ that were made in every particular version.
From version 0.7.6 *Dependency Injector* framework strictly From version 0.7.6 *Dependency Injector* framework strictly
follows `Semantic versioning`_ follows `Semantic versioning`_
4.29.1
------
- Fix recursive copying issue in ``Delegate`` provider.
See issue: `#245 <https://github.com/ets-labs/python-dependency-injector/issues/245>`_.
Thanks to `@GitterRemote <https://github.com/GitterRemote>`_ for reporting the issue.
- Add docs and example for ``Factory.add_attributes()`` method.
- Remove legacy css file.
4.29.0 4.29.0
------ ------
- Implement context manager interface for resetting a singleton provider. - Implement context manager interface for resetting a singleton provider.

View File

@ -40,6 +40,14 @@ injected following these rules:
:language: python :language: python
:lines: 3- :lines: 3-
``Factory`` provider can inject attributes. Use ``.add_attributes()`` method to specify
attribute injections.
.. literalinclude:: ../../examples/providers/factory_attribute_injections.py
:language: python
:lines: 3-
:emphasize-lines: 18-18
Passing arguments to the underlying providers Passing arguments to the underlying providers
--------------------------------------------- ---------------------------------------------

View File

@ -0,0 +1,28 @@
"""`Factory` provider attribute injections example."""
from dependency_injector import containers, providers
class Client:
...
class Service:
def __init__(self) -> None:
self.client = None
class Container(containers.DeclarativeContainer):
client = providers.Factory(Client)
service = providers.Factory(Service)
service.add_attributes(clent=client)
if __name__ == '__main__':
container = Container()
service = container.service()
assert isinstance(service.client, Client)

View File

@ -1,6 +1,6 @@
"""Top-level package.""" """Top-level package."""
__version__ = '4.29.0' __version__ = '4.29.1'
"""Version number. """Version number.
:type: str :type: str

File diff suppressed because it is too large Load Diff

View File

@ -91,9 +91,10 @@ class Self(Provider[T]):
class Delegate(Provider[Provider]): class Delegate(Provider[Provider]):
def __init__(self, provides: Provider) -> None: ... def __init__(self, provides: Optional[Provider] = None) -> None: ...
@property @property
def provides(self) -> Provider: ... def provides(self) -> Optional[Provider]: ...
def set_provides(self, provides: Optional[Provider]): ...
class Dependency(Provider[T]): class Dependency(Provider[T]):

View File

@ -519,13 +519,14 @@ cdef class Delegate(Provider):
:type: object :type: object
""" """
def __init__(self, provides): def __init__(self, provides=None):
"""Initializer. """Initializer.
:param provides: Value that have to be provided. :param provides: Value that have to be provided.
:type provides: :py:class:`Provider` :type provides: :py:class:`Provider`
""" """
self.__provides = ensure_is_provider(provides) self.__provides = None
self.set_provides(provides)
super(Delegate, self).__init__() super(Delegate, self).__init__()
def __deepcopy__(self, memo): def __deepcopy__(self, memo):
@ -534,8 +535,11 @@ cdef class Delegate(Provider):
if copied is not None: if copied is not None:
return copied return copied
copied = self.__class__(deepcopy(self.__provides, memo)) copied = self.__class__()
memo[id(self)] = copied
if self.provides:
copied.set_provides(deepcopy(self.provides, memo))
self._copy_overridings(copied, memo) self._copy_overridings(copied, memo)
return copied return copied
@ -556,9 +560,13 @@ cdef class Delegate(Provider):
@property @property
def provides(self): def provides(self):
"""Return provider."""
return self.__provides return self.__provides
def set_provides(self, provides):
if provides:
provides = ensure_is_provider(provides)
self.__provides = provides
@property @property
def related(self): def related(self):
"""Return related providers generator.""" """Return related providers generator."""