ets-labs/python-dependency-injector
1
1
Fork 0
mirror of https://github.com/ets-labs/python-dependency-injector.git synced 2024-11-22 17:47:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix declarative container multi-level inheritance issue

Browse Source
This commit is contained in:
Roman Mogylatov 2021-01-12 17:49:48 -05:00
parent 46422a6845
commit dd57c68ce5
3 changed files with 782 additions and 737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1460
src/dependency_injector/containers.c
View File

File diff suppressed because it is too large Load Diff

27
src/dependency_injector/containers.pyx
View File

@ -262,21 +262,26 @@ class DeclarativeContainerMetaClass(type):
cdef tuple inherited_providers cdef tuple inherited_providers
cdef type cls cdef type cls
containers = tuple((name, container) containers = tuple(
for name, container in six.iteritems(attributes) (name, container)
if is_container(container)) for name, container in six.iteritems(attributes)
if is_container(container)
)
attributes['containers'] = dict(containers) attributes['containers'] = dict(containers)
cls_providers = tuple((name, provider) cls_providers = tuple(
for name, provider in six.iteritems(attributes) (name, provider)
if isinstance(provider, Provider)) for name, provider in six.iteritems(attributes)
if isinstance(provider, Provider)
)
inherited_providers = tuple((name, provider) inherited_providers = tuple(
for base in bases if is_container( (name, provider)
base) and base is not DynamicContainer for base in bases
for name, provider in six.iteritems( if is_container(base) and base is not DynamicContainer
base.cls_providers)) for name, provider in six.iteritems(base.providers)
)
attributes['cls_providers'] = dict(cls_providers) attributes['cls_providers'] = dict(cls_providers)
attributes['inherited_providers'] = dict(inherited_providers) attributes['inherited_providers'] = dict(inherited_providers)

32
tests/unit/containers/test_declarative_py2_py3.py
View File

@ -20,6 +20,11 @@ class ContainerB(ContainerA):
p22 = providers.Provider() p22 = providers.Provider()
class ContainerC(ContainerB):
p31 = providers.Provider()
p32 = providers.Provider()
class DeclarativeContainerTests(unittest.TestCase): class DeclarativeContainerTests(unittest.TestCase):
def test_providers_attribute(self): def test_providers_attribute(self):
@ -29,18 +34,31 @@ class DeclarativeContainerTests(unittest.TestCase):
p12=ContainerA.p12, p12=ContainerA.p12,
p21=ContainerB.p21, p21=ContainerB.p21,
p22=ContainerB.p22)) p22=ContainerB.p22))
self.assertEqual(ContainerC.providers, dict(p11=ContainerA.p11,
p12=ContainerA.p12,
p21=ContainerB.p21,
p22=ContainerB.p22,
p31=ContainerC.p31,
p32=ContainerC.p32))
def test_cls_providers_attribute(self): def test_cls_providers_attribute(self):
self.assertEqual(ContainerA.cls_providers, dict(p11=ContainerA.p11, self.assertEqual(ContainerA.cls_providers, dict(p11=ContainerA.p11,
p12=ContainerA.p12)) p12=ContainerA.p12))
self.assertEqual(ContainerB.cls_providers, dict(p21=ContainerB.p21, self.assertEqual(ContainerB.cls_providers, dict(p21=ContainerB.p21,
p22=ContainerB.p22)) p22=ContainerB.p22))
self.assertEqual(ContainerC.cls_providers, dict(p31=ContainerC.p31,
p32=ContainerC.p32))
def test_inherited_providers_attribute(self): def test_inherited_providers_attribute(self):
self.assertEqual(ContainerA.inherited_providers, dict()) self.assertEqual(ContainerA.inherited_providers, dict())
self.assertEqual(ContainerB.inherited_providers, self.assertEqual(ContainerB.inherited_providers,
dict(p11=ContainerA.p11, dict(p11=ContainerA.p11,
p12=ContainerA.p12)) p12=ContainerA.p12))
self.assertEqual(ContainerC.inherited_providers,
dict(p11=ContainerA.p11,
p12=ContainerA.p12,
p21=ContainerB.p21,
p22=ContainerB.p22))
def test_set_get_del_providers(self): def test_set_get_del_providers(self):
a_p13 = providers.Provider() a_p13 = providers.Provider()
@ -330,3 +348,17 @@ class DeclarativeContainerTests(unittest.TestCase):
a = providers.Factory(A) a = providers.Factory(A)
assert isinstance(Services(a=a).c().a, A) # ok assert isinstance(Services(a=a).c().a, A) # ok
Services(a=a).b().fa() Services(a=a).b().fa()
def test_init_with_grand_child_provider(self):
# Bug:
# https://github.com/ets-labs/python-dependency-injector/issues/350
provider = providers.Provider()
container = ContainerC(p11=provider)
self.assertIsInstance(container.p11, providers.Provider)
self.assertIsInstance(container.p12, providers.Provider)
self.assertIsInstance(container.p21, providers.Provider)
self.assertIsInstance(container.p22, providers.Provider)
self.assertIsInstance(container.p31, providers.Provider)
self.assertIsInstance(container.p32, providers.Provider)
self.assertIs(container.p11.last_overriding, provider)