diff options
| -rw-r--r-- | src/mailman/rest/members.py | 2 | ||||
| -rw-r--r-- | src/mailman/rest/tests/test_validator.py | 4 | ||||
| -rw-r--r-- | src/mailman/rest/validator.py | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mailman/rest/members.py b/src/mailman/rest/members.py index 197e2232b..11ad17c14 100644 --- a/src/mailman/rest/members.py +++ b/src/mailman/rest/members.py @@ -167,7 +167,7 @@ class AMember(_MemberBase): values = Validator( address=str, delivery_mode=enum_validator(DeliveryMode), - moderation_action=enum_validator(Action, allow_none=True), + moderation_action=enum_validator(Action, allow_blank=True), _optional=('address', 'delivery_mode', 'moderation_action'), )(request) except ValueError as error: diff --git a/src/mailman/rest/tests/test_validator.py b/src/mailman/rest/tests/test_validator.py index 734ec0399..32ba7a845 100644 --- a/src/mailman/rest/tests/test_validator.py +++ b/src/mailman/rest/tests/test_validator.py @@ -89,5 +89,5 @@ class TestValidators(unittest.TestCase): self.assertRaises(ValueError, enum_validator(Action), 'not-a-thing') - def test_enum_validator_none(self): - self.assertEqual(enum_validator(Action, allow_none=True)(''), None) + def test_enum_validator_blank(self): + self.assertEqual(enum_validator(Action, allow_blank=True)(''), None) diff --git a/src/mailman/rest/validator.py b/src/mailman/rest/validator.py index 0a6184850..bcc6b3321 100644 --- a/src/mailman/rest/validator.py +++ b/src/mailman/rest/validator.py @@ -52,14 +52,14 @@ class ReadOnlyPATCHRequestError(RESTError): class enum_validator: """Convert an enum value name into an enum value.""" - def __init__(self, enum_class, allow_none=False): + def __init__(self, enum_class, *, allow_blank=False): self._enum_class = enum_class - self._allow_none = allow_none + self._allow_blank = allow_blank def __call__(self, enum_value): # This will raise a KeyError if the enum value is unknown. The # Validator API requires turning this into a ValueError. - if self._allow_none and not enum_value: + if not enum_value and self._allow_blank: return None try: return self._enum_class[enum_value] |