From 9f02444e55b3c3b4ad51352981442362f85abec8 Mon Sep 17 00:00:00 2001
From: Lorenzo Tanganelli <lorenzo.tanganelli@hotmail.it>
Date: Thu, 15 May 2025 17:11:39 +0200
Subject: [PATCH] optimize and import re

---
 plugins/filter/remove_keys_from_values.py | 29 ++++++++++-------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/plugins/filter/remove_keys_from_values.py b/plugins/filter/remove_keys_from_values.py
index 27e80d22d5..786a4d2239 100644
--- a/plugins/filter/remove_keys_from_values.py
+++ b/plugins/filter/remove_keys_from_values.py
@@ -126,6 +126,7 @@ _value:
   type: raw
 """
 
+import re
 from ansible.errors import AnsibleFilterError
 
 
@@ -168,18 +169,17 @@ def remove_keys_from_values(data, values=None, recursive=True, matching_paramete
     Removes keys from dictionaries or lists of dictionaries
     if their values match the specified values or regex patterns.
     """
-    default_values = ['', [], {}, None]
-    if values is None:
-        values = default_values
-    elif not isinstance(values, list):
-        values = [values]
+    
+    if not isinstance(data, (dict, list)):
+        raise AnsibleFilterError("Input must be a dictionary or a list.")
 
-    if matching_parameter not in ["equal", "regex"]:
-        raise AnsibleFilterError(f"Invalid matching_parameter '{matching_parameter}'. Use 'equal' or 'regex'.")
+    if matching_parameter not in ("equal", "regex"):
+        raise AnsibleFilterError("matching_parameter must be 'equal' or 'regex'")
+
+    values = values if isinstance(values, list) else [values or '', [], {}, None]
 
     regex_patterns = []
     if matching_parameter == "regex":
-        # Convert string patterns to compiled regex
         try:
             regex_patterns = [re.compile(v) for v in values]
         except re.error as e:
@@ -188,7 +188,7 @@ def remove_keys_from_values(data, values=None, recursive=True, matching_paramete
     def should_remove(val):
         if matching_parameter == "equal":
             return val in values
-        elif matching_parameter == "regex" and isinstance(val, str):
+        if matching_parameter == "regex" and isinstance(val, str):
             return any(p.match(val) for p in regex_patterns)
         return False
 
@@ -200,15 +200,10 @@ def remove_keys_from_values(data, values=None, recursive=True, matching_paramete
                 if not should_remove(clean(v) if recursive else v)
             }
         elif isinstance(obj, list):
-            return [clean(item) if recursive else item for item in obj]
-        else:
-            return obj
-
-    if isinstance(data, (dict, list)):
-        return clean(data)
-    else:
-        raise AnsibleFilterError("Input must be a dictionary or a list of dictionaries.")
+            return [clean(i) if recursive else i for i in obj]
+        return obj
 
+    return clean(data)
 
 class FilterModule(object):
     def filters(self):