summaryrefslogtreecommitdiff
path: root/mailman/Utils.py
diff options
context:
space:
mode:
authorBarry Warsaw2008-09-26 21:11:51 -0400
committerBarry Warsaw2008-09-26 21:11:51 -0400
commitb6eff15e7d34e60e0fa9f13b5e944d73bf499414 (patch)
tree31dc0a415cf454740f1cb2c02b35a341889bb28c /mailman/Utils.py
parent6f4351721559e8b7b577d3a01216fec88121ed11 (diff)
downloadmailman-b6eff15e7d34e60e0fa9f13b5e944d73bf499414.tar.gz
mailman-b6eff15e7d34e60e0fa9f13b5e944d73bf499414.tar.zst
mailman-b6eff15e7d34e60e0fa9f13b5e944d73bf499414.zip
Diffstat (limited to 'mailman/Utils.py')
-rw-r--r--mailman/Utils.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/mailman/Utils.py b/mailman/Utils.py
index 7975cb9d3..178fff538 100644
--- a/mailman/Utils.py
+++ b/mailman/Utils.py
@@ -40,10 +40,11 @@ from email.Errors import HeaderParseError
from string import ascii_letters, digits, whitespace
import mailman.templates
-from mailman import Errors
+
from mailman import passwords
from mailman.SafeDict import SafeDict
from mailman.configuration import config
+from mailman.core import errors
AT = '@'
CR = '\r'
@@ -199,15 +200,15 @@ def ValidateEmail(s):
"""Verify that the an email address isn't grossly evil."""
# Pretty minimal, cheesy check. We could do better...
if not s or ' ' in s:
- raise Errors.InvalidEmailAddress(repr(s))
+ raise errors.InvalidEmailAddress(repr(s))
if _badchars.search(s) or s[0] == '-':
- raise Errors.InvalidEmailAddress(repr(s))
+ raise errors.InvalidEmailAddress(repr(s))
user, domain_parts = ParseEmail(s)
# Local, unqualified addresses are not allowed.
if not domain_parts:
- raise Errors.InvalidEmailAddress(repr(s))
+ raise errors.InvalidEmailAddress(repr(s))
if len(domain_parts) < 2:
- raise Errors.InvalidEmailAddress(repr(s))
+ raise errors.InvalidEmailAddress(repr(s))