remove extra exception handling

ansible · Nov 27, 2023 · 0de2af4 · 0de2af4
1 parent a97f73b
commit 0de2af4
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/lib/ansible/plugins/loader.py b/lib/ansible/plugins/loader.py
@@ -237,10 +237,7 @@ def __init__(self, class_name, package, config, subdir, aliases=None, required_b
         self._module_cache = MODULE_CACHE[class_name]
         self._paths = PATH_CACHE[class_name]
         self._plugin_path_cache = PLUGIN_PATH_CACHE[class_name]
-        try:
-            self._plugin_instance_cache = OrderedDict() if self.type == 'vars' else None
-        except ValueError:
-            self._plugin_instance_cache = None
+        self._plugin_instance_cache = OrderedDict() if self.subdir == 'vars' else None
 
         self._searched_paths = set()
 
@@ -265,7 +262,7 @@ def _clear_caches(self):
             self._module_cache = MODULE_CACHE[self.class_name]
             self._paths = PATH_CACHE[self.class_name]
             self._plugin_path_cache = PLUGIN_PATH_CACHE[self.class_name]
-            self._plugin_instance_cache = OrderedDict() if self.type == 'vars' else None
+            self._plugin_instance_cache = OrderedDict() if self.subdir == 'vars' else None
             self._searched_paths = set()
 
     def __setstate__(self, data):