[#4801] Simplify even more the erros handling in navl

amercader · amercader · commit 7b6702b6c17e · 2019-12-13T13:18:54.000+01:00
diff --git a/ckan/lib/navl/dictization_functions.py b/ckan/lib/navl/dictization_functions.py
@@ -247,22 +247,6 @@ def convert(converter, key, converted_data, errors, context):
         return
 
 
-def _remove_blank_keys(schema):
-
-    schema_copy = copy.deepcopy(schema)
-
-    for key, value in schema_copy.items():
-        if len(value) and isinstance(value[0], dict):
-            for item in value:
-                if not item:
-                    value.remove(item)
-                _remove_blank_keys(item)
-        if not any(value):
-            schema.pop(key)
-
-    return schema
-
-
 def validate(data, schema, context=None):
     '''Validate an unflattened nested dict against a schema.'''
     context = context or {}
@@ -289,10 +273,12 @@ def validate(data, schema, context=None):
             if key not in converted_data:
                 converted_data[key] = []
 
-    errors_unflattened = unflatten(errors)
-
     # remove validators that passed
-    _remove_blank_keys(errors_unflattened)
+    for key in list(errors.keys()):
+        if not errors[key]:
+            del errors[key]
+
+    errors_unflattened = unflatten(errors)
 
     return converted_data, errors_unflattened
 
diff --git a/ckan/tests/legacy/lib/test_navl.py b/ckan/tests/legacy/lib/test_navl.py
@@ -281,7 +281,7 @@ def test_simple():
     converted_data, errors = validate(data, schema)
 
     print(errors)
-    assert errors == {'numbers': [{'code': [u'Missing value']}, {}]}
+    assert errors == {'numbers': [{'code': [u'Missing value']}]}
 
 
 def test_simple_converter_types():
