Refactor wiring

This commit is contained in:
Roman Mogylatov 2021-02-27 09:43:12 -05:00
parent 5daa64284c
commit 71720ac418
2 changed files with 6 additions and 7 deletions

View File

@ -19,8 +19,6 @@ Development version
- Make refactoring of wiring module and tests. - Make refactoring of wiring module and tests.
See PR # `#406 <https://github.com/ets-labs/python-dependency-injector/issues/406>`_. See PR # `#406 <https://github.com/ets-labs/python-dependency-injector/issues/406>`_.
Thanks to `@withshubh <https://github.com/withshubh>`_ for the contribution: Thanks to `@withshubh <https://github.com/withshubh>`_ for the contribution:
- Refactor unnecessary ``else`` / ``elif`` in ``wiring`` module when ``if`` block has a
return statement.
- Remove unused imports in tests. - Remove unused imports in tests.
- Use literal syntax to create data structure in tests. - Use literal syntax to create data structure in tests.
- Add integration with a static analysis tool `DeepSource <https://deepsource.io/>`_. - Add integration with a static analysis tool `DeepSource <https://deepsource.io/>`_.

View File

@ -122,19 +122,20 @@ class ProvidersMap:
) -> Optional[providers.Provider]: ) -> Optional[providers.Provider]:
if isinstance(provider, providers.Delegate): if isinstance(provider, providers.Delegate):
return self._resolve_delegate(provider) return self._resolve_delegate(provider)
if isinstance(provider, ( elif isinstance(provider, (
providers.ProvidedInstance, providers.ProvidedInstance,
providers.AttributeGetter, providers.AttributeGetter,
providers.ItemGetter, providers.ItemGetter,
providers.MethodCaller, providers.MethodCaller,
)): )):
return self._resolve_provided_instance(provider) return self._resolve_provided_instance(provider)
if isinstance(provider, providers.ConfigurationOption): elif isinstance(provider, providers.ConfigurationOption):
return self._resolve_config_option(provider) return self._resolve_config_option(provider)
if isinstance(provider, providers.TypedConfigurationOption): elif isinstance(provider, providers.TypedConfigurationOption):
return self._resolve_config_option(provider.option, as_=provider.provides) return self._resolve_config_option(provider.option, as_=provider.provides)
if isinstance(provider, str): elif isinstance(provider, str):
return self._resolve_string_id(provider, modifier) return self._resolve_string_id(provider, modifier)
else:
return self._resolve_provider(provider) return self._resolve_provider(provider)
def _resolve_string_id( def _resolve_string_id(