summaryrefslogtreecommitdiff
path: root/src/mailman/utilities
diff options
context:
space:
mode:
authorBarry Warsaw2016-03-24 21:29:30 -0400
committerBarry Warsaw2016-03-24 21:29:30 -0400
commit5404f98d90410d69a744d9c0fb71a8a31f3a4a88 (patch)
treebeb5010e4d74ab0f8056419dc05058fc2bbd8cc6 /src/mailman/utilities
parenta0cf7d44cbf0527d8bac05f870208a85689da42f (diff)
downloadmailman-5404f98d90410d69a744d9c0fb71a8a31f3a4a88.tar.gz
mailman-5404f98d90410d69a744d9c0fb71a8a31f3a4a88.tar.zst
mailman-5404f98d90410d69a744d9c0fb71a8a31f3a4a88.zip
Clean up the core directory.
mailman/core/errors.py is gone now. We had a duplicate base exception which now always comes from mailman/interfaces/errors.py. Obsolete/unused exceptions are remove. The other exceptions are moved to better locations.
Diffstat (limited to 'src/mailman/utilities')
-rw-r--r--src/mailman/utilities/i18n.py2
-rw-r--r--src/mailman/utilities/importer.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mailman/utilities/i18n.py b/src/mailman/utilities/i18n.py
index 069bd8f52..3999af869 100644
--- a/src/mailman/utilities/i18n.py
+++ b/src/mailman/utilities/i18n.py
@@ -31,8 +31,8 @@ import sys
from itertools import product
from mailman.config import config
from mailman.core.constants import system_preferences
-from mailman.core.errors import MailmanError
from mailman.core.i18n import _
+from mailman.interfaces.errors import MailmanError
from mailman.utilities.string import expand, wrap as wrap_text
from pkg_resources import resource_filename
diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py
index 782841838..3d1a8b82f 100644
--- a/src/mailman/utilities/importer.py
+++ b/src/mailman/utilities/importer.py
@@ -31,7 +31,6 @@ import logging
import datetime
from mailman.config import config
-from mailman.core.errors import MailmanError
from mailman.handlers.decorate import decorate, decorate_template
from mailman.interfaces.action import Action, FilterAction
from mailman.interfaces.address import IEmailValidator
@@ -40,6 +39,7 @@ from mailman.interfaces.autorespond import ResponseAction
from mailman.interfaces.bans import IBanManager
from mailman.interfaces.bounce import UnrecognizedBounceDisposition
from mailman.interfaces.digests import DigestFrequency
+from mailman.interfaces.errors import MailmanError
from mailman.interfaces.languages import ILanguageManager
from mailman.interfaces.mailinglist import (
IAcceptableAliasSet, IHeaderMatchList)