diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst index d90837b8..80a6c133 100644 --- a/docs/main/changelog.rst +++ b/docs/main/changelog.rst @@ -19,8 +19,6 @@ Development version - Make refactoring of wiring module and tests. See PR # `#406 `_. Thanks to `@withshubh `_ for the contribution: - - Refactor unnecessary ``else`` / ``elif`` in ``wiring`` module when ``if`` block has a - return statement. - Remove unused imports in tests. - Use literal syntax to create data structure in tests. - Add integration with a static analysis tool `DeepSource `_. diff --git a/src/dependency_injector/wiring.py b/src/dependency_injector/wiring.py index 54c90534..c5a591da 100644 --- a/src/dependency_injector/wiring.py +++ b/src/dependency_injector/wiring.py @@ -122,20 +122,21 @@ class ProvidersMap: ) -> Optional[providers.Provider]: if isinstance(provider, providers.Delegate): return self._resolve_delegate(provider) - if isinstance(provider, ( + elif isinstance(provider, ( providers.ProvidedInstance, providers.AttributeGetter, providers.ItemGetter, providers.MethodCaller, )): return self._resolve_provided_instance(provider) - if isinstance(provider, providers.ConfigurationOption): + elif isinstance(provider, providers.ConfigurationOption): 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) - if isinstance(provider, str): + elif isinstance(provider, str): return self._resolve_string_id(provider, modifier) - return self._resolve_provider(provider) + else: + return self._resolve_provider(provider) def _resolve_string_id( self,