Merge branch 'release/3.8.0' into master

Author: rmk135

docs/main/changelog.rst

@@ -7,6 +7,13 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly 
 follows `Semantic versioning`_
 
+3.8.0
+-----
+- Add ``DeclarativeContainer.containers`` attribute that stores dictionary of
+  nested containers.
+- Fix bug related to double-overridden providers (provider1 -> provider2 ->
+  provider3).
+
 3.7.1
 -----
 - Add support of six 1.11.0.

src/dependency_injector/__init__.py

@@ -1,6 +1,6 @@
 """Dependency injector top-level package."""
 
-__version__ = '3.7.1'
+__version__ = '3.8.0'
 """Version number that follows semantic versioning.
 
 :type: str

src/dependency_injector/containers.c

@@ -144,6 +144,12 @@ class DeclarativeContainerMetaClass(type):
         cdef tuple inherited_providers
         cdef type cls
 
+        containers = tuple((name, container)
+                           for name, container in six.iteritems(attributes)
+                           if is_container(container))
+
+        attributes['containers'] = dict(containers)
+
         cls_providers = tuple((name, provider)
                               for name, provider in six.iteritems(attributes)
                               if isinstance(provider, Provider))
@@ -229,6 +235,12 @@ class DeclarativeContainer(object):
     :type: type
     """
 
+    containers = dict()
+    """Read-only dictionary of all nested containers.
+
+    :type: dict[str, :py:class:`DeclarativeContainer`]
+    """
+
     providers = dict()
     """Read-only dictionary of all providers.
 

src/dependency_injector/containers.pyx

@@ -96,7 +96,7 @@ cdef class Provider(object):
         Callable interface implementation.
         """
         if self.__last_overriding is not None:
-            return self.__last_overriding._provide(args, kwargs)
+            return self.__last_overriding(*args, **kwargs)
         return self._provide(args, kwargs)
 
     def __deepcopy__(self, memo):
@@ -353,7 +353,7 @@ cdef class ExternalDependency(Provider):
         if self.__last_overriding is None:
             raise Error('Dependency is not defined')
 
-        instance = self.__last_overriding._provide(args, kwargs)
+        instance = self.__last_overriding(*args, **kwargs)
 
         if not isinstance(instance, self.instance_of):
             raise Error('{0} is not an '.format(instance) +
@@ -634,7 +634,7 @@ cdef class AbstractCallable(Callable):
         """
         if self.__last_overriding is None:
             raise Error('{0} must be overridden before calling'.format(self))
-        return self.__last_overriding._provide(args, kwargs)
+        return self.__last_overriding(*args, **kwargs)
 
     def override(self, provider):
         """Override provider with another provider.
@@ -1076,7 +1076,7 @@ cdef class AbstractFactory(Factory):
         """
         if self.__last_overriding is None:
             raise Error('{0} must be overridden before calling'.format(self))
-        return self.__last_overriding._provide(args, kwargs)
+        return self.__last_overriding(*args, **kwargs)
 
     def override(self, provider):
         """Override provider with another provider.
@@ -1606,7 +1606,7 @@ cdef class AbstractSingleton(BaseSingleton):
         """
         if self.__last_overriding is None:
             raise Error('{0} must be overridden before calling'.format(self))
-        return self.__last_overriding._provide(args, kwargs)
+        return self.__last_overriding(*args, **kwargs)
 
     def override(self, provider):
         """Override provider with another provider.

src/dependency_injector/providers.c

@@ -250,3 +250,18 @@ class _Container2(_Container):
 
         self.assertEqual(_Container1.p13(), 11)
         self.assertEqual(_Container2.p13(), 22)
+
+    def test_containers_attribute(self):
+        class Container(containers.DeclarativeContainer):
+            class Container1(containers.DeclarativeContainer):
+                pass
+
+            class Container2(containers.DeclarativeContainer):
+                pass
+
+            Container3 = containers.DynamicContainer()
+
+        self.assertEqual(Container.containers,
+                         dict(Container1=Container.Container1,
+                              Container2=Container.Container2,
+                              Container3=Container.Container3))

src/dependency_injector/providers.pyx

@@ -51,6 +51,15 @@ def test_override(self):
         self.assertTrue(self.provider.overridden)
         self.assertIs(self.provider.last_overriding, overriding_provider)
 
+    def test_double_override(self):
+        overriding_provider1 = providers.Object(1)
+        overriding_provider2 = providers.Object(2)
+
+        self.provider.override(overriding_provider1)
+        overriding_provider1.override(overriding_provider2)
+
+        self.assertEqual(self.provider(), overriding_provider2())
+
     def test_overriding_context(self):
         overriding_provider = providers.Provider()
         with self.provider.override(overriding_provider):