From 8259210f2784e109ad3b5b092754c2983a12fe30 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Sun, 24 Dec 2017 22:59:36 +0200 Subject: [PATCH] Update bundles example --- .../bundles/bundles/photos/__init__.py | 2 +- .../bundles/bundles/users/__init__.py | 2 +- examples/miniapps/bundles/core/__init__.py | 0 examples/miniapps/bundles/core/containers.py | 43 ------------------- examples/miniapps/bundles/run.py | 2 +- 5 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 examples/miniapps/bundles/core/__init__.py delete mode 100644 examples/miniapps/bundles/core/containers.py diff --git a/examples/miniapps/bundles/bundles/photos/__init__.py b/examples/miniapps/bundles/bundles/photos/__init__.py index 228e054a..08f443f4 100644 --- a/examples/miniapps/bundles/bundles/photos/__init__.py +++ b/examples/miniapps/bundles/bundles/photos/__init__.py @@ -1,6 +1,6 @@ """Photos bundle.""" -from core import containers +from dependency_injector import containers from dependency_injector import providers from . import entities diff --git a/examples/miniapps/bundles/bundles/users/__init__.py b/examples/miniapps/bundles/bundles/users/__init__.py index 93eee1a3..6b23144e 100644 --- a/examples/miniapps/bundles/bundles/users/__init__.py +++ b/examples/miniapps/bundles/bundles/users/__init__.py @@ -1,6 +1,6 @@ """Users bundle.""" -from core import containers +from dependency_injector import containers from dependency_injector import providers from . import entities diff --git a/examples/miniapps/bundles/core/__init__.py b/examples/miniapps/bundles/core/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/examples/miniapps/bundles/core/containers.py b/examples/miniapps/bundles/core/containers.py deleted file mode 100644 index f99fbfdb..00000000 --- a/examples/miniapps/bundles/core/containers.py +++ /dev/null @@ -1,43 +0,0 @@ -"""Containers module.""" - -import six - -from dependency_injector import containers, providers - - -class DeclarativeContainer(containers.DeclarativeContainer): - """Declarative container.""" - - def __new__(cls, **dependencies): - """Constructor. - - :return: Dynamic container with copy of all providers. - :rtype: :py:class:`DynamicContainer` - """ - # Make copy of declarative container providers for container instance - container_providers = providers.deepcopy(cls.providers) - - # Fetch container dependencies - container_dependencies = dict() - for name, provider in six.iteritems(container_providers): - if isinstance(provider, providers.Dependency): - container_dependencies[name] = provider - - # Satisfy container dependencies - for name, dependency in six.iteritems(container_dependencies): - try: - dependency_provider = dependencies[name] - except KeyError: - raise Exception('Dependency {name} of container {container} ' - 'is not satisfied'.format( - name=name, container=cls)) - else: - dependency.provided_by(dependency_provider) - - # Create dynamic container - container = cls.instance_type() - container.provider_type = cls.provider_type - for name, provider in six.iteritems(container_providers): - setattr(container, name, provider) - - return container diff --git a/examples/miniapps/bundles/run.py b/examples/miniapps/bundles/run.py index d77061e9..b5da7baf 100644 --- a/examples/miniapps/bundles/run.py +++ b/examples/miniapps/bundles/run.py @@ -1,6 +1,6 @@ """Example application - Bundles.""" -from core import containers +from dependency_injector import containers from dependency_injector import providers from bundles.users import Users