Fix error dict with nested validation.

2012-06-27 13:32:17 -07:00 · 2012-06-27 13:32:17 -07:00 · b3bb4add9c
commit b3bb4add9c
parent 7a1b110f62
1 changed files with 5 additions and 5 deletions
--- a/mongoengine/base.py
+++ b/mongoengine/base.py
@ -403,11 +403,11 @@ class ComplexBaseField(BaseField):
            for k, v in sequence:
                try:
                    self.field._validate(v)
-                except (ValidationError, AssertionError), error:
-                    if hasattr(error, 'errors'):
-                        errors[k] = error.errors
-                    else:
+                except ValidationError, error:
+                    errors[k] = error.errors or error
+                except (ValueError, AssertionError), error:
                    errors[k] = error
+
            if errors:
                field_class = self.field.__class__.__name__
                self.error('Invalid %s item (%s)' % (field_class, value),