Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Homogenize email-validation into one utility. Resolve #2143

Browse source
This commit is contained in:
Griatch 2020-06-27 13:12:41 +02:00
parent 8f85bc1873
commit c8b056d06d
2 changed files with 15 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

9
evennia/utils/validatorfuncs.py
View file

@ -11,10 +11,8 @@ They can employ more paramters at your leisure.
import re as _re
import pytz as _pytz
import datetime as _dt
from django.core.exceptions import ValidationError as _error
from django.core.validators import validate_email as _val_email
from evennia.utils.ansi import strip_ansi
from evennia.utils.utils import string_partial_matching as _partial
from evennia.utils.utils import string_partial_matching as _partial, validate_email_address
from django.utils.translation import gettext as _
_TZ_DICT = {str(tz): _pytz.timezone(tz) for tz in _pytz.common_timezones}
@ -210,9 +208,8 @@ def timezone(entry, option_key="Timezone", **kwargs):
def email(entry, option_key="Email Address", **kwargs):
if not entry:
raise ValueError("Email address field empty!")
try:
_val_email(str(entry)) # offloading the hard work to Django!
except _error:
valid = validate_email_address(entry)
if not valid:
raise ValueError(f"That isn't a valid {option_key}!")
return entry