From 71720ac41802cf11dd59f1db8e3f54f0f83f4c44 Mon Sep 17 00:00:00 2001
From: Roman Mogylatov <rmogilatov@gmail.com>
Date: Sat, 27 Feb 2021 09:43:12 -0500
Subject: [PATCH] Refactor wiring

---
 docs/main/changelog.rst           |  2 --
 src/dependency_injector/wiring.py | 11 ++++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

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 <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/>`_.
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,