Refactor wiring

Author: rmk135

docs/main/changelog.rst

@@ -19,8 +19,6 @@ Development version
 - Make refactoring of wiring module and tests.
   See PR # `#406 <https://github.com/ets-labs/python-dependency-injector/issues/406>`_.
   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.
     - Use literal syntax to create data structure in tests.
 - Add integration with a static analysis tool `DeepSource <https://deepsource.io/>`_.

src/dependency_injector/wiring.py

@@ -122,20 +122,21 @@ def resolve_provider(
     ) -> 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,