summaryrefslogtreecommitdiff
path: root/src/mailman/email
diff options
context:
space:
mode:
authorBarry Warsaw2011-05-01 12:44:23 -0400
committerBarry Warsaw2011-05-01 12:44:23 -0400
commitcab8aea12c63fe4bcf8930e9b2f53012d2a74ee8 (patch)
treeb348573e40c969c3ae1f24387c1a6ebbf78c5d35 /src/mailman/email
parenta90ca4ce77d99460ffd36a366cea0162869df783 (diff)
downloadmailman-cab8aea12c63fe4bcf8930e9b2f53012d2a74ee8.tar.gz
mailman-cab8aea12c63fe4bcf8930e9b2f53012d2a74ee8.tar.zst
mailman-cab8aea12c63fe4bcf8930e9b2f53012d2a74ee8.zip
Diffstat (limited to 'src/mailman/email')
-rw-r--r--src/mailman/email/utils.py41
-rw-r--r--src/mailman/email/validate.py3
2 files changed, 1 insertions, 43 deletions
diff --git a/src/mailman/email/utils.py b/src/mailman/email/utils.py
deleted file mode 100644
index b4f3ac5f7..000000000
--- a/src/mailman/email/utils.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (C) 2009-2011 by the Free Software Foundation, Inc.
-#
-# This file is part of GNU Mailman.
-#
-# GNU Mailman is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option)
-# any later version.
-#
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# GNU Mailman. If not, see <http://www.gnu.org/licenses/>.
-
-"""Module stuff."""
-
-from __future__ import absolute_import, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'split_email',
- ]
-
-
-def split_email(address):
- """Split an email address into a user name and domain.
-
- :param address: An email address.
- :type address: string
- :return: The user name and domain split on dots.
- :rtype: 2-tuple where the first item is the local part and the second item
- is a sequence of domain parts.
- """
- local_part, at, domain = address.partition('@')
- if len(at) == 0:
- # There was no at-sign in the email address.
- return local_part, None
- return local_part, domain.split('.')
diff --git a/src/mailman/email/validate.py b/src/mailman/email/validate.py
index 0c4c6a5e0..97b4b9e5f 100644
--- a/src/mailman/email/validate.py
+++ b/src/mailman/email/validate.py
@@ -29,10 +29,9 @@ import re
from zope.interface import implements
-
-from mailman.email.utils import split_email
from mailman.interfaces.address import (
IEmailValidator, InvalidEmailAddressError)
+from mailman.utilities.email import split_email
# What other characters should be disallowed?