------------------------------------------------------------
revno: 6706
committer: Barry Warsaw <[email protected]>
branch nick: setup
timestamp: Mon 2009-03-09 23:54:22 -0400
message:
Get rid of the mailman.rules entry point.
modified:
setup.py
src/mailman/core/rules.py
src/mailman/pipeline/__init__.py
src/mailman/rules/__init__.py
=== modified file 'setup.py'
--- setup.py 2009-03-10 03:49:20 +0000
+++ setup.py 2009-03-10 03:54:22 +0000
@@ -86,7 +86,6 @@
include_package_data = True,
entry_points = {
'console_scripts' : list(scripts),
- 'mailman.rules' : 'default = mailman.rules:initialize',
'mailman.scrubber' : 'stock = mailman.archiving.pipermail:Pipermail',
},
install_requires = [
=== modified file 'src/mailman/core/rules.py'
--- src/mailman/core/rules.py 2009-01-17 02:04:21 +0000
+++ src/mailman/core/rules.py 2009-03-10 03:54:22 +0000
@@ -28,19 +28,18 @@
from zope.interface.verify import verifyObject
from mailman.config import config
-from mailman.core.plugins import get_plugins
from mailman.interfaces.rules import IRule
+from mailman.rules import builtin_rules
def initialize():
"""Find and register all rules in all plugins."""
# Find rules in plugins.
- for rule_finder in get_plugins('mailman.rules'):
- for rule_class in rule_finder():
- rule = rule_class()
- verifyObject(IRule, rule)
- assert rule.name not in config.rules, (
- 'Duplicate rule "{0}" found in {1}'.format(
- rule.name, rule_finder))
- config.rules[rule.name] = rule
+ for rule_class in builtin_rules():
+ rule = rule_class()
+ verifyObject(IRule, rule)
+ assert rule.name not in config.rules, (
+ 'Duplicate rule "{0}" found in {1}'.format(
+ rule.name, rule_finder))
+ config.rules[rule.name] = rule
=== modified file 'src/mailman/pipeline/__init__.py'
--- src/mailman/pipeline/__init__.py 2009-03-10 03:49:20 +0000
+++ src/mailman/pipeline/__init__.py 2009-03-10 03:54:22 +0000
@@ -33,7 +33,7 @@
def builtin_handlers():
- """Initialize the built-in handlers.
+ """Return the built-in handlers.
Rules are auto-discovered by searching for IHandler implementations in all
importable modules in this subpackage.
=== modified file 'src/mailman/rules/__init__.py'
--- src/mailman/rules/__init__.py 2009-01-17 02:04:21 +0000
+++ src/mailman/rules/__init__.py 2009-03-10 03:54:22 +0000
@@ -21,7 +21,7 @@
__metaclass__ = type
__all__ = [
- 'initialize',
+ 'builtin_rules',
]
@@ -32,8 +32,8 @@
-def initialize():
- """Initialize the built-in rules.
+def builtin_rules():
+ """Return the built-in rules.
Rules are auto-discovered by searching for IRule implementations in all
importable modules in this subpackage.
--
Primary development focus
https://code.launchpad.net/~mailman-coders/mailman/3.0
Your team Mailman Checkins is subscribed to branch lp:mailman.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/3.0/+edit-subscription.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
