Merge pull request keleshev#16 from Rogdham/empty-or

Make empty Or raise SchemaError. Fixes keleshev#13.
Rogdham · Apr 18, 2013 · 43dbb1c · 43dbb1c
2 parents b17b7b2 + d8dc368
commit 43dbb1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/schema.py b/schema.py
@@ -47,7 +47,7 @@ def validate(self, data):
 class Or(And):
 
     def validate(self, data):
-        x = None
+        x = SchemaError([], [])
         for s in [Schema(s, error=self._error) for s in self._args]:
             try:
                 return s.validate(data)

diff --git a/test_schema.py b/test_schema.py
@@ -66,6 +66,8 @@ def test_or():
     assert Or(int, dict).validate(5) == 5
     assert Or(int, dict).validate({}) == {}
     with SE: Or(int, dict).validate('hai')
+    assert Or(int).validate(4)
+    with SE: Or().validate(2)
 
 
 def test_validate_list():