diff --git a/orm/users.py b/orm/users.py index f7bf6a3..eaae679 100644 --- a/orm/users.py +++ b/orm/users.py @@ -771,7 +771,7 @@ def __init__(self, aliasname, main, *args, **kwargs): self.fromdict(aliasname) def fromdict(self, aliasname, *args, **kwargs): - if not formats.email.match(aliasname): + if not formats.email.match(aliasname) and not formats.email_domain.match(aliasname): raise ValueError("'{}' is not a valid email address".format(aliasname)) self.aliasname = aliasname return self diff --git a/tools/formats.py b/tools/formats.py index c2e9276..6499fa2 100644 --- a/tools/formats.py +++ b/tools/formats.py @@ -5,4 +5,5 @@ import re email = re.compile(r"^(?P[a-zA-Z0-9_.+-]+)@(?P[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+)$") +email_domain = re.compile(r"^@(?P[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+)$") domain = re.compile(r"^[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$")