diff options
Diffstat (limited to 'src/mailman/pipeline')
| -rw-r--r-- | src/mailman/pipeline/acknowledge.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/after_delivery.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/avoid_duplicates.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/calculate_recipients.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/cleanse.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/cleanse_dkim.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/cook_headers.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/decorate.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/file_recipients.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/mime_delete.py | 3 | ||||
| -rw-r--r-- | src/mailman/pipeline/moderate.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/replybot.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/scrubber.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/tagger.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/to_archive.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/to_digest.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/to_outgoing.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/to_usenet.py | 2 |
18 files changed, 19 insertions, 18 deletions
diff --git a/src/mailman/pipeline/acknowledge.py b/src/mailman/pipeline/acknowledge.py index 5daf30003..2d0efd808 100644 --- a/src/mailman/pipeline/acknowledge.py +++ b/src/mailman/pipeline/acknowledge.py @@ -32,8 +32,8 @@ from zope.interface import implements from mailman import Utils from mailman.config import config +from mailman.core.i18n import _ from mailman.email.message import Message, UserNotification -from mailman.i18n import _ from mailman.interfaces.handler import IHandler diff --git a/src/mailman/pipeline/after_delivery.py b/src/mailman/pipeline/after_delivery.py index 4626ba292..ce64e7a9f 100644 --- a/src/mailman/pipeline/after_delivery.py +++ b/src/mailman/pipeline/after_delivery.py @@ -29,7 +29,7 @@ import datetime from zope.interface import implements -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler diff --git a/src/mailman/pipeline/avoid_duplicates.py b/src/mailman/pipeline/avoid_duplicates.py index 840d5f8b2..ca4dbe11b 100644 --- a/src/mailman/pipeline/avoid_duplicates.py +++ b/src/mailman/pipeline/avoid_duplicates.py @@ -34,7 +34,7 @@ __all__ = [ from email.Utils import getaddresses, formataddr from zope.interface import implements -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler diff --git a/src/mailman/pipeline/calculate_recipients.py b/src/mailman/pipeline/calculate_recipients.py index ccbc069d1..d044d9587 100644 --- a/src/mailman/pipeline/calculate_recipients.py +++ b/src/mailman/pipeline/calculate_recipients.py @@ -35,7 +35,7 @@ from zope.interface import implements from mailman import Utils from mailman.config import config from mailman.core import errors -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler from mailman.interfaces.member import DeliveryStatus diff --git a/src/mailman/pipeline/cleanse.py b/src/mailman/pipeline/cleanse.py index 330f415c2..2b746e34a 100644 --- a/src/mailman/pipeline/cleanse.py +++ b/src/mailman/pipeline/cleanse.py @@ -30,7 +30,7 @@ import logging from email.Utils import formataddr from zope.interface import implements -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler from mailman.pipeline.cook_headers import uheader diff --git a/src/mailman/pipeline/cleanse_dkim.py b/src/mailman/pipeline/cleanse_dkim.py index 38623079c..c96dde192 100644 --- a/src/mailman/pipeline/cleanse_dkim.py +++ b/src/mailman/pipeline/cleanse_dkim.py @@ -37,7 +37,7 @@ from lazr.config import as_boolean from zope.interface import implements from mailman.config import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler diff --git a/src/mailman/pipeline/cook_headers.py b/src/mailman/pipeline/cook_headers.py index 3c67d0193..c9115c468 100644 --- a/src/mailman/pipeline/cook_headers.py +++ b/src/mailman/pipeline/cook_headers.py @@ -33,7 +33,7 @@ from email.utils import parseaddr, formataddr, getaddresses from zope.interface import implements from mailman.config import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler from mailman.interfaces.mailinglist import Personalization, ReplyToMunging from mailman.version import VERSION diff --git a/src/mailman/pipeline/decorate.py b/src/mailman/pipeline/decorate.py index f9e41e177..65badcd4a 100644 --- a/src/mailman/pipeline/decorate.py +++ b/src/mailman/pipeline/decorate.py @@ -33,8 +33,8 @@ from zope.component import getUtility from zope.interface import implements from mailman.config import config +from mailman.core.i18n import _ from mailman.email.message import Message -from mailman.i18n import _ from mailman.interfaces.handler import IHandler from mailman.interfaces.usermanager import IUserManager from mailman.utilities.string import expand diff --git a/src/mailman/pipeline/file_recipients.py b/src/mailman/pipeline/file_recipients.py index c3d995a9c..fdc09068a 100644 --- a/src/mailman/pipeline/file_recipients.py +++ b/src/mailman/pipeline/file_recipients.py @@ -30,7 +30,7 @@ import errno from zope.interface import implements -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler diff --git a/src/mailman/pipeline/mime_delete.py b/src/mailman/pipeline/mime_delete.py index 17da13c4a..158b46ad1 100644 --- a/src/mailman/pipeline/mime_delete.py +++ b/src/mailman/pipeline/mime_delete.py @@ -44,11 +44,12 @@ from zope.interface import implements from mailman.Utils import oneline from mailman.config import config from mailman.core import errors -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler from mailman.queue import Switchboard from mailman.version import VERSION + log = logging.getLogger('mailman.error') diff --git a/src/mailman/pipeline/moderate.py b/src/mailman/pipeline/moderate.py index 3714f3bfc..1481ca9ad 100644 --- a/src/mailman/pipeline/moderate.py +++ b/src/mailman/pipeline/moderate.py @@ -33,8 +33,8 @@ from email.MIMEText import MIMEText from mailman.Utils import wrap from mailman.config import config from mailman.core import errors +from mailman.core.i18n import _ from mailman.email.message import UserNotification -from mailman.i18n import _ diff --git a/src/mailman/pipeline/replybot.py b/src/mailman/pipeline/replybot.py index e7834eb2c..cf559cfcc 100644 --- a/src/mailman/pipeline/replybot.py +++ b/src/mailman/pipeline/replybot.py @@ -33,8 +33,8 @@ from zope.interface import implements from mailman import Utils from mailman.config import config +from mailman.core.i18n import _ from mailman.email.message import Message, UserNotification -from mailman.i18n import _ from mailman.interfaces.autorespond import ( ALWAYS_REPLY, IAutoResponseSet, Response, ResponseAction) from mailman.interfaces.handler import IHandler diff --git a/src/mailman/pipeline/scrubber.py b/src/mailman/pipeline/scrubber.py index e5510e0ab..8465702d2 100644 --- a/src/mailman/pipeline/scrubber.py +++ b/src/mailman/pipeline/scrubber.py @@ -46,7 +46,7 @@ from zope.interface import implements from mailman.Utils import oneline, websafe from mailman.config import config from mailman.core.errors import DiscardMessage -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler from mailman.utilities.filesystem import makedirs from mailman.utilities.modules import find_name diff --git a/src/mailman/pipeline/tagger.py b/src/mailman/pipeline/tagger.py index 9a0acc1e3..babf395dc 100644 --- a/src/mailman/pipeline/tagger.py +++ b/src/mailman/pipeline/tagger.py @@ -33,7 +33,7 @@ import email.Parser from zope.interface import implements -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler diff --git a/src/mailman/pipeline/to_archive.py b/src/mailman/pipeline/to_archive.py index 7f1702fe9..827c4f93c 100644 --- a/src/mailman/pipeline/to_archive.py +++ b/src/mailman/pipeline/to_archive.py @@ -28,7 +28,7 @@ __all__ = [ from zope.interface import implements from mailman.config import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler diff --git a/src/mailman/pipeline/to_digest.py b/src/mailman/pipeline/to_digest.py index 78d8e1970..e859af4f1 100644 --- a/src/mailman/pipeline/to_digest.py +++ b/src/mailman/pipeline/to_digest.py @@ -31,8 +31,8 @@ import datetime from zope.interface import implements from mailman.config import config +from mailman.core.i18n import _ from mailman.email.message import Message -from mailman.i18n import _ from mailman.interfaces.handler import IHandler from mailman.interfaces.mailinglist import DigestFrequency from mailman.utilities.mailbox import Mailbox diff --git a/src/mailman/pipeline/to_outgoing.py b/src/mailman/pipeline/to_outgoing.py index ef6908ab8..d9894238b 100644 --- a/src/mailman/pipeline/to_outgoing.py +++ b/src/mailman/pipeline/to_outgoing.py @@ -34,7 +34,7 @@ from lazr.config import as_boolean from zope.interface import implements from mailman.config import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler from mailman.interfaces.mailinglist import Personalization diff --git a/src/mailman/pipeline/to_usenet.py b/src/mailman/pipeline/to_usenet.py index 220374348..1095ea1d7 100644 --- a/src/mailman/pipeline/to_usenet.py +++ b/src/mailman/pipeline/to_usenet.py @@ -30,7 +30,7 @@ import logging from zope.interface import implements from mailman.config import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler COMMASPACE = ', ' |
