From ef32f11f159f856d88b766837ace1ed0fdefdb23 Mon Sep 17 00:00:00 2001 From: Adam Tankanow Date: Mon, 7 Dec 2020 12:08:56 -0500 Subject: Revert "Ensure `Maybe` propagates error information (#411)" This reverts commit da3cc967f7b16f18bf8c1feacfeced8f10ce9e40. --- voluptuous/tests/tests.py | 2 +- voluptuous/validators.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/voluptuous/tests/tests.py b/voluptuous/tests/tests.py index 54dcc7f..448abc3 100644 --- a/voluptuous/tests/tests.py +++ b/voluptuous/tests/tests.py @@ -516,7 +516,7 @@ def test_repr(): ) assert_equal(repr(coerce_), "Coerce(int, msg='moo')") assert_equal(repr(all_), "All('10', Coerce(int, msg=None), msg='all msg')") - assert_equal(repr(maybe_int), "Any(%s, None, msg=None)" % str(int)) + assert_equal(repr(maybe_int), "Any(None, %s, msg=None)" % str(int)) def test_list_validation_messages(): diff --git a/voluptuous/validators.py b/voluptuous/validators.py index 678e3d2..e8f8a8b 100644 --- a/voluptuous/validators.py +++ b/voluptuous/validators.py @@ -555,7 +555,7 @@ def Maybe(validator, msg=None): ... s("string") """ - return Any(validator, None, msg=msg) + return Any(None, validator, msg=msg) class Range(object): -- cgit v1.2.1