Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "validator: Add generic check_or." 

This reverts commit cd93d0967f.

This check_or is redundant with check_union; it gives a misleading
error message for the non-matching case; and it has no type safety.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-09-28 00:09:17 -07:00 committed by Tim Abbott
parent cd93d0967f
commit 0f7d0a23c9
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/lib/validator.py
View File

@ -582,15 +582,3 @@ def check_string_or_int(var_name: str, val: object) -> Union[str, int]:
return val
raise ValidationError(_("{var_name} is not a string or integer").format(var_name=var_name))
def check_or(sub_validator1: Validator[Any], sub_validator2: Validator[Any]) -> Validator[Any]:
def f(var_name: str, val: object) -> Validator[Any]:
try:
return sub_validator1(var_name, val)
except ValidationError:
pass
return sub_validator2(var_name, val)
return f

20
zerver/tests/test_decorators.py
View File

@ -70,7 +70,6 @@ from zerver.lib.validator import (
check_int_in,
check_list,
check_none_or,
check_or,
check_short_string,
check_string,
check_string_fixed_length,
@ -992,25 +991,6 @@ class ValidatorTestCase(ZulipTestCase):
with self.assertRaisesRegex(ValidationError, r"x is not a string or integer"):
check_string_or_int("x", x)
def test_check_or(self) -> None:
x: Any = "valid"
check_or(check_string_in(["valid"]), check_url)("x", x)
x = "http://zulip-bots.example.com/"
check_or(check_string_in(["valid"]), check_url)("x", x)
x = "invalid"
with self.assertRaisesRegex(ValidationError, r"x is not a URL"):
check_or(check_string_in(["valid"]), check_url)("x", x)
x = "http://127.0.0"
with self.assertRaisesRegex(ValidationError, r"x is not a URL"):
check_or(check_string_in(["valid"]), check_url)("x", x)
x = 1
with self.assertRaisesRegex(ValidationError, r"x is not a string"):
check_or(check_string_in(["valid"]), check_url)("x", x)
class DeactivatedRealmTest(ZulipTestCase):
def test_send_deactivated_realm(self) -> None: