diff options
Diffstat (limited to 'mailman/rules')
| -rw-r--r-- | mailman/rules/__init__.py | 6 | ||||
| -rw-r--r-- | mailman/rules/administrivia.py | 2 | ||||
| -rw-r--r-- | mailman/rules/any.py | 2 | ||||
| -rw-r--r-- | mailman/rules/approved.py | 6 | ||||
| -rw-r--r-- | mailman/rules/docs/moderation.txt | 2 | ||||
| -rw-r--r-- | mailman/rules/docs/rules.txt | 2 | ||||
| -rw-r--r-- | mailman/rules/emergency.py | 2 | ||||
| -rw-r--r-- | mailman/rules/implicit_dest.py | 2 | ||||
| -rw-r--r-- | mailman/rules/loop.py | 2 | ||||
| -rw-r--r-- | mailman/rules/max_recipients.py | 2 | ||||
| -rw-r--r-- | mailman/rules/max_size.py | 2 | ||||
| -rw-r--r-- | mailman/rules/moderation.py | 2 | ||||
| -rw-r--r-- | mailman/rules/news_moderation.py | 3 | ||||
| -rw-r--r-- | mailman/rules/no_subject.py | 2 | ||||
| -rw-r--r-- | mailman/rules/suspicious.py | 2 | ||||
| -rw-r--r-- | mailman/rules/truth.py | 2 |
16 files changed, 23 insertions, 18 deletions
diff --git a/mailman/rules/__init__.py b/mailman/rules/__init__.py index f7cf3da38..82a463f76 100644 --- a/mailman/rules/__init__.py +++ b/mailman/rules/__init__.py @@ -18,13 +18,15 @@ """The built in rule set.""" __metaclass__ = type -__all__ = ['initialize'] +__all__ = [ + 'initialize', + ] import os import sys -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule diff --git a/mailman/rules/administrivia.py b/mailman/rules/administrivia.py index 802229101..f21db6744 100644 --- a/mailman/rules/administrivia.py +++ b/mailman/rules/administrivia.py @@ -28,7 +28,7 @@ from zope.interface import implements from mailman.config import config from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule # The list of email commands we search for in the Subject header and payload. diff --git a/mailman/rules/any.py b/mailman/rules/any.py index 14e01ce5a..71df37584 100644 --- a/mailman/rules/any.py +++ b/mailman/rules/any.py @@ -24,7 +24,7 @@ __metaclass__ = type from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule diff --git a/mailman/rules/approved.py b/mailman/rules/approved.py index 3ad14b195..79dc0d934 100644 --- a/mailman/rules/approved.py +++ b/mailman/rules/approved.py @@ -17,8 +17,10 @@ """Look for moderator pre-approval.""" -__all__ = ['Approved'] __metaclass__ = type +__all__ = [ + 'Approved', + ] import re @@ -26,7 +28,7 @@ from email.iterators import typed_subpart_iterator from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule EMPTYSTRING = u'' diff --git a/mailman/rules/docs/moderation.txt b/mailman/rules/docs/moderation.txt index 9f3663517..5e002a850 100644 --- a/mailman/rules/docs/moderation.txt +++ b/mailman/rules/docs/moderation.txt @@ -28,7 +28,7 @@ Let's add the message author as a non-moderated member. >>> user = config.db.user_manager.create_user( ... u'aperson@example.org', u'Anne Person') >>> address = list(user.addresses)[0] - >>> from mailman.interfaces import MemberRole + >>> from mailman.interfaces.member import MemberRole >>> member = address.subscribe(mlist, MemberRole.member) >>> member.is_moderated False diff --git a/mailman/rules/docs/rules.txt b/mailman/rules/docs/rules.txt index bae9f594a..1fba63b64 100644 --- a/mailman/rules/docs/rules.txt +++ b/mailman/rules/docs/rules.txt @@ -13,7 +13,7 @@ Rules are maintained in the configuration object as a dictionary mapping rule names to rule objects. >>> from zope.interface.verify import verifyObject - >>> from mailman.interfaces import IRule + >>> from mailman.interfaces.rules import IRule >>> for rule_name in sorted(config.rules): ... rule = config.rules[rule_name] ... print rule_name, verifyObject(IRule, rule) diff --git a/mailman/rules/emergency.py b/mailman/rules/emergency.py index deff0c4fd..f24acba8c 100644 --- a/mailman/rules/emergency.py +++ b/mailman/rules/emergency.py @@ -24,7 +24,7 @@ __metaclass__ = type from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule diff --git a/mailman/rules/implicit_dest.py b/mailman/rules/implicit_dest.py index f50f88f1d..9320a9ea1 100644 --- a/mailman/rules/implicit_dest.py +++ b/mailman/rules/implicit_dest.py @@ -26,7 +26,7 @@ from email.utils import getaddresses from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule diff --git a/mailman/rules/loop.py b/mailman/rules/loop.py index 74d46b8cd..a0abbbaa4 100644 --- a/mailman/rules/loop.py +++ b/mailman/rules/loop.py @@ -24,7 +24,7 @@ __metaclass__ = type from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule diff --git a/mailman/rules/max_recipients.py b/mailman/rules/max_recipients.py index 1f8ecda2e..6fa3e1ee4 100644 --- a/mailman/rules/max_recipients.py +++ b/mailman/rules/max_recipients.py @@ -25,7 +25,7 @@ from email.utils import getaddresses from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule diff --git a/mailman/rules/max_size.py b/mailman/rules/max_size.py index 33d6a8df0..1ce280e88 100644 --- a/mailman/rules/max_size.py +++ b/mailman/rules/max_size.py @@ -24,7 +24,7 @@ __metaclass__ = type from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule diff --git a/mailman/rules/moderation.py b/mailman/rules/moderation.py index 99b4b0a30..6f6bcfb36 100644 --- a/mailman/rules/moderation.py +++ b/mailman/rules/moderation.py @@ -27,7 +27,7 @@ __metaclass__ = type from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule diff --git a/mailman/rules/news_moderation.py b/mailman/rules/news_moderation.py index 3c55a724f..822e43445 100644 --- a/mailman/rules/news_moderation.py +++ b/mailman/rules/news_moderation.py @@ -24,7 +24,8 @@ __metaclass__ = type from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule, NewsModeration +from mailman.interfaces import NewsModeration +from mailman.interfaces.rules import IRule diff --git a/mailman/rules/no_subject.py b/mailman/rules/no_subject.py index f77688aae..08848154d 100644 --- a/mailman/rules/no_subject.py +++ b/mailman/rules/no_subject.py @@ -24,7 +24,7 @@ __metaclass__ = type from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule diff --git a/mailman/rules/suspicious.py b/mailman/rules/suspicious.py index 92f885558..13052298b 100644 --- a/mailman/rules/suspicious.py +++ b/mailman/rules/suspicious.py @@ -27,7 +27,7 @@ from email.utils import getaddresses from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule diff --git a/mailman/rules/truth.py b/mailman/rules/truth.py index aa5599fb0..4d1a3cca7 100644 --- a/mailman/rules/truth.py +++ b/mailman/rules/truth.py @@ -24,7 +24,7 @@ __all__ = ['Truth'] from zope.interface import implements from mailman.i18n import _ -from mailman.interfaces import IRule +from mailman.interfaces.rules import IRule |