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

Add few minor refactorings

Browse Source
This commit is contained in:
Roman Mogilatov 2015-09-03 16:00:23 +03:00
parent 4291f0efc1
commit b5ad081976
5 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.9.1
0.9.2

6
dependency_injector/catalog.py
View File

@ -52,9 +52,9 @@ class AbstractCatalog(object):
@classmethod
def filter(cls, provider_type):
"""Return dict of providers, that are instance of provided type."""
return dict([(name, provider)
for name, provider in six.iteritems(cls.providers)
if isinstance(provider, provider_type)])
return dict((name, provider)
for name, provider in six.iteritems(cls.providers)
if isinstance(provider, provider_type))
@classmethod
def override(cls, overriding):

8
dependency_injector/injections.py
View File

@ -54,11 +54,11 @@ def inject(*args, **kwargs):
:type injection: Injection
:return: (callable) -> (callable)
"""
injections = tuple((KwArg(name, value)
for name, value in six.iteritems(kwargs)))
injections = tuple(KwArg(name, value)
for name, value in six.iteritems(kwargs))
if args:
injections += tuple((ensure_is_injection(injection)
for injection in args))
injections += tuple(ensure_is_injection(injection)
for injection in args)
def decorator(callback):
"""Dependency injection decorator."""

26
dependency_injector/providers.py
View File

@ -108,18 +108,18 @@ class Factory(Provider):
raise Error('Factory provider expects to get callable, ' +
'got {0} instead'.format(str(provides)))
self._provides = provides
self._kwargs = tuple((injection
for injection in injections
if is_kwarg_injection(injection)))
self._kwargs = tuple(injection
for injection in injections
if is_kwarg_injection(injection))
if kwargs:
self._kwargs += tuple((KwArg(name, value)
for name, value in six.iteritems(kwargs)))
self._attributes = tuple((injection
for injection in injections
if is_attribute_injection(injection)))
self._methods = tuple((injection
for injection in injections
if is_method_injection(injection)))
self._kwargs += tuple(KwArg(name, value)
for name, value in six.iteritems(kwargs))
self._attributes = tuple(injection
for injection in injections
if is_attribute_injection(injection))
self._methods = tuple(injection
for injection in injections
if is_method_injection(injection))
super(Factory, self).__init__()
def _provide(self, *args, **kwargs):
@ -262,8 +262,8 @@ class Callable(Provider):
if not callable(callback):
raise Error('Callable expected, got {0}'.format(str(callback)))
self._callback = callback
self._kwargs = tuple((KwArg(name, value)
for name, value in six.iteritems(kwargs)))
self._kwargs = tuple(KwArg(name, value)
for name, value in six.iteritems(kwargs))
super(Callable, self).__init__()
def _provide(self, *args, **kwargs):

4
docs/main/changelog.rst
View File

@ -13,6 +13,10 @@ Development version
- No featues.
0.9.2
-----
- Add minor refactorings.
0.9.1
-----
- Add simplified syntax of kwarg injections for ``di.Factory`` and