diff options
Diffstat (limited to 'mailman/pipeline')
26 files changed, 41 insertions, 29 deletions
diff --git a/mailman/pipeline/__init__.py b/mailman/pipeline/__init__.py index a77e00915..d6e1b0129 100644 --- a/mailman/pipeline/__init__.py +++ b/mailman/pipeline/__init__.py @@ -18,13 +18,15 @@ """The built in set of pipeline handlers.""" __metaclass__ = type -__all__ = ['initialize'] +__all__ = [ + 'initialize', + ] import os import sys -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler diff --git a/mailman/pipeline/acknowledge.py b/mailman/pipeline/acknowledge.py index 57817b6b0..1e42f5049 100644 --- a/mailman/pipeline/acknowledge.py +++ b/mailman/pipeline/acknowledge.py @@ -30,7 +30,7 @@ from mailman import Message from mailman import Utils from mailman.config import config from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler diff --git a/mailman/pipeline/after_delivery.py b/mailman/pipeline/after_delivery.py index e5bc98fcd..d19d4a541 100644 --- a/mailman/pipeline/after_delivery.py +++ b/mailman/pipeline/after_delivery.py @@ -18,7 +18,9 @@ """Perform some bookkeeping after a successful post.""" __metaclass__ = type -__all__ = ['AfterDelivery'] +__all__ = [ + 'AfterDelivery', + ] import datetime @@ -26,7 +28,7 @@ import datetime from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler diff --git a/mailman/pipeline/avoid_duplicates.py b/mailman/pipeline/avoid_duplicates.py index ddfbc4578..d7e920e81 100644 --- a/mailman/pipeline/avoid_duplicates.py +++ b/mailman/pipeline/avoid_duplicates.py @@ -32,7 +32,7 @@ from zope.interface import implements from mailman.config import config from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler COMMASPACE = ', ' diff --git a/mailman/pipeline/calculate_recipients.py b/mailman/pipeline/calculate_recipients.py index 18d237ec0..8f1310ab8 100644 --- a/mailman/pipeline/calculate_recipients.py +++ b/mailman/pipeline/calculate_recipients.py @@ -33,7 +33,8 @@ from mailman import Utils from mailman.config import config from mailman.core import errors from mailman.i18n import _ -from mailman.interfaces import DeliveryStatus, IHandler +from mailman.interfaces.handler import IHandler +from mailman.interfaces.member import DeliveryStatus diff --git a/mailman/pipeline/cleanse.py b/mailman/pipeline/cleanse.py index a2b19545e..28c660bdc 100644 --- a/mailman/pipeline/cleanse.py +++ b/mailman/pipeline/cleanse.py @@ -27,7 +27,7 @@ from email.Utils import formataddr from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler from mailman.pipeline.cook_headers import uheader diff --git a/mailman/pipeline/cleanse_dkim.py b/mailman/pipeline/cleanse_dkim.py index 4edd8193d..bd7de83dc 100644 --- a/mailman/pipeline/cleanse_dkim.py +++ b/mailman/pipeline/cleanse_dkim.py @@ -33,7 +33,7 @@ from zope.interface import implements from mailman import Defaults from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler diff --git a/mailman/pipeline/cook_headers.py b/mailman/pipeline/cook_headers.py index 18000e01a..d8d5e3651 100644 --- a/mailman/pipeline/cook_headers.py +++ b/mailman/pipeline/cook_headers.py @@ -35,7 +35,8 @@ from mailman import Utils from mailman.config import config from mailman.core.plugins import get_plugins from mailman.i18n import _ -from mailman.interfaces import IHandler, Personalization, ReplyToMunging +from mailman.interfaces.handler import IHandler +from mailman.interfaces.mailinglist import Personalization, ReplyToMunging from mailman.version import VERSION diff --git a/mailman/pipeline/decorate.py b/mailman/pipeline/decorate.py index 4e4b1b97b..2a7e7b065 100644 --- a/mailman/pipeline/decorate.py +++ b/mailman/pipeline/decorate.py @@ -33,7 +33,7 @@ from mailman import Utils from mailman.Message import Message from mailman.config import config from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler log = logging.getLogger('mailman.error') diff --git a/mailman/pipeline/docs/acknowledge.txt b/mailman/pipeline/docs/acknowledge.txt index aabd8196a..a4c68f900 100644 --- a/mailman/pipeline/docs/acknowledge.txt +++ b/mailman/pipeline/docs/acknowledge.txt @@ -21,7 +21,7 @@ acknowledgment. Subscribe a user to the mailing list. >>> usermgr = config.db.user_manager - >>> from mailman.interfaces import MemberRole + >>> from mailman.interfaces.member import MemberRole >>> user_1 = usermgr.create_user(u'aperson@example.com') >>> address_1 = list(user_1.addresses)[0] >>> address_1.subscribe(mlist, MemberRole.member) diff --git a/mailman/pipeline/docs/avoid-duplicates.txt b/mailman/pipeline/docs/avoid-duplicates.txt index e1d31716a..fe91a9a71 100644 --- a/mailman/pipeline/docs/avoid-duplicates.txt +++ b/mailman/pipeline/docs/avoid-duplicates.txt @@ -11,7 +11,7 @@ recipients from the list of recipients that earlier handler modules Create some members we're going to use. - >>> from mailman.interfaces import MemberRole + >>> from mailman.interfaces.member import MemberRole >>> address_a = config.db.user_manager.create_address( ... u'aperson@example.com') >>> address_b = config.db.user_manager.create_address( diff --git a/mailman/pipeline/docs/calc-recips.txt b/mailman/pipeline/docs/calc-recips.txt index 550edff51..adfbeabbf 100644 --- a/mailman/pipeline/docs/calc-recips.txt +++ b/mailman/pipeline/docs/calc-recips.txt @@ -21,7 +21,7 @@ start out with. First, create a bunch of addresses... ...then subscribe these addresses to the mailing list as members... - >>> from mailman.interfaces import MemberRole + >>> from mailman.interfaces.member import MemberRole >>> member_a = address_a.subscribe(mlist, MemberRole.member) >>> member_b = address_b.subscribe(mlist, MemberRole.member) >>> member_c = address_c.subscribe(mlist, MemberRole.member) diff --git a/mailman/pipeline/docs/cook-headers.txt b/mailman/pipeline/docs/cook-headers.txt index eb1a4e6bc..732231e1f 100644 --- a/mailman/pipeline/docs/cook-headers.txt +++ b/mailman/pipeline/docs/cook-headers.txt @@ -300,7 +300,8 @@ messages are fully personalized, that header will get overwritten with the address of the recipient. The list's posting address will be added to one of the recipient headers so that users will be able to reply back to the list. - >>> from mailman.interfaces import Personalization, ReplyToMunging + >>> from mailman.interfaces.mailinglist import ( + ... Personalization, ReplyToMunging) >>> mlist.personalize = Personalization.full >>> mlist.reply_goes_to_list = ReplyToMunging.no_munging >>> msg = message_from_string("""\ diff --git a/mailman/pipeline/docs/file-recips.txt b/mailman/pipeline/docs/file-recips.txt index d006151ba..81510b6e7 100644 --- a/mailman/pipeline/docs/file-recips.txt +++ b/mailman/pipeline/docs/file-recips.txt @@ -78,7 +78,7 @@ However, if the sender of the original message is a member of the list and their address is in the include file, the sender's address is /not/ included in the recipients list. - >>> from mailman.interfaces import MemberRole + >>> from mailman.interfaces.member import MemberRole >>> address_1 = config.db.user_manager.create_address( ... u'cperson@example.com') >>> address_1.subscribe(mlist, MemberRole.member) diff --git a/mailman/pipeline/docs/reply-to.txt b/mailman/pipeline/docs/reply-to.txt index 570ffb7ea..e57b97e5d 100644 --- a/mailman/pipeline/docs/reply-to.txt +++ b/mailman/pipeline/docs/reply-to.txt @@ -36,7 +36,7 @@ A list can be configured to add a Reply-To header pointing back to the mailing list's posting address. If there's no Reply-To header in the original message, the list's posting address simply gets inserted. - >>> from mailman.interfaces import ReplyToMunging + >>> from mailman.interfaces.mailinglist import ReplyToMunging >>> mlist.reply_goes_to_list = ReplyToMunging.point_to_list >>> mlist.preferred_language = u'en' >>> mlist.description = u'' diff --git a/mailman/pipeline/docs/to-outgoing.txt b/mailman/pipeline/docs/to-outgoing.txt index 81e870e6c..e7f412690 100644 --- a/mailman/pipeline/docs/to-outgoing.txt +++ b/mailman/pipeline/docs/to-outgoing.txt @@ -68,7 +68,7 @@ VERP'd. >>> from mailman import Defaults >>> verp_personalized_delivieries = Defaults.VERP_PERSONALIZED_DELIVERIES >>> Defaults.VERP_PERSONALIZED_DELIVERIES = True - >>> from mailman.interfaces import Personalization + >>> from mailman.interfaces.mailinglist import Personalization >>> mlist.personalize = Personalization.individual >>> msgdata = dict(foo=1, bar=2) >>> handler.process(mlist, msg, msgdata) diff --git a/mailman/pipeline/file_recipients.py b/mailman/pipeline/file_recipients.py index 75a00c14e..f356e2e18 100644 --- a/mailman/pipeline/file_recipients.py +++ b/mailman/pipeline/file_recipients.py @@ -29,7 +29,7 @@ import errno from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler diff --git a/mailman/pipeline/mime_delete.py b/mailman/pipeline/mime_delete.py index 57d529112..0245e347a 100644 --- a/mailman/pipeline/mime_delete.py +++ b/mailman/pipeline/mime_delete.py @@ -42,7 +42,7 @@ from mailman.Utils import oneline from mailman.config import config from mailman.core import errors from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler from mailman.queue import Switchboard from mailman.version import VERSION diff --git a/mailman/pipeline/replybot.py b/mailman/pipeline/replybot.py index e889e58af..ee0894d12 100644 --- a/mailman/pipeline/replybot.py +++ b/mailman/pipeline/replybot.py @@ -31,7 +31,7 @@ from zope.interface import implements from mailman import Message from mailman import Utils from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler log = logging.getLogger('mailman.error') diff --git a/mailman/pipeline/scrubber.py b/mailman/pipeline/scrubber.py index b8beb22ad..7431cec27 100644 --- a/mailman/pipeline/scrubber.py +++ b/mailman/pipeline/scrubber.py @@ -44,7 +44,7 @@ from mailman.config import config from mailman.core.errors import DiscardMessage from mailman.core.plugins import get_plugin from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler # Path characters for common platforms diff --git a/mailman/pipeline/smtp_direct.py b/mailman/pipeline/smtp_direct.py index b203ebb8e..9d2019ec4 100644 --- a/mailman/pipeline/smtp_direct.py +++ b/mailman/pipeline/smtp_direct.py @@ -50,7 +50,8 @@ from mailman import Utils from mailman.config import config from mailman.core import errors from mailman.i18n import _ -from mailman.interfaces import IHandler, Personalization +from mailman.interfaces.handler import IHandler +from mailman.interfaces.mailinglist import Personalization DOT = '.' diff --git a/mailman/pipeline/tagger.py b/mailman/pipeline/tagger.py index d631342d3..db4bb13b9 100644 --- a/mailman/pipeline/tagger.py +++ b/mailman/pipeline/tagger.py @@ -30,7 +30,7 @@ import email.Parser from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler OR = '|' diff --git a/mailman/pipeline/to_archive.py b/mailman/pipeline/to_archive.py index 5c32be53d..15f4c856e 100644 --- a/mailman/pipeline/to_archive.py +++ b/mailman/pipeline/to_archive.py @@ -18,14 +18,16 @@ """Add the message to the archives.""" __metaclass__ = type -__all__ = ['ToArchive'] +__all__ = [ + 'ToArchive', + ] from zope.interface import implements from mailman.config import config from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler diff --git a/mailman/pipeline/to_digest.py b/mailman/pipeline/to_digest.py index 96bfcdf47..d71bc71b0 100644 --- a/mailman/pipeline/to_digest.py +++ b/mailman/pipeline/to_digest.py @@ -56,7 +56,8 @@ from mailman.Mailbox import Mailbox from mailman.Mailbox import Mailbox from mailman.config import config from mailman.core import errors -from mailman.interfaces import DeliveryMode, DeliveryStatus, IHandler +from mailman.interfaces.handler import IHandler +from mailman.interfaces.member import DeliveryMode, DeliveryStatus from mailman.pipeline.decorate import decorate from mailman.pipeline.scrubber import process as scrubber diff --git a/mailman/pipeline/to_outgoing.py b/mailman/pipeline/to_outgoing.py index fdf201793..7d56686b7 100644 --- a/mailman/pipeline/to_outgoing.py +++ b/mailman/pipeline/to_outgoing.py @@ -31,7 +31,8 @@ from zope.interface import implements from mailman import Defaults from mailman.config import config from mailman.i18n import _ -from mailman.interfaces import IHandler, Personalization +from mailman.interfaces.handler import IHandler +from mailman.interfaces.mailinglist import Personalization diff --git a/mailman/pipeline/to_usenet.py b/mailman/pipeline/to_usenet.py index 08e785d54..a635b65b3 100644 --- a/mailman/pipeline/to_usenet.py +++ b/mailman/pipeline/to_usenet.py @@ -27,7 +27,7 @@ from zope.interface import implements from mailman.config import config from mailman.i18n import _ -from mailman.interfaces import IHandler +from mailman.interfaces.handler import IHandler COMMASPACE = ', ' |