------------------------------------------------------------
revno: 6707
committer: Barry Warsaw <[email protected]>
branch nick: setup
timestamp: Tue 2009-03-10 00:06:16 -0400
message:
Get rid of the mailman.scrubber entry point.
modified:
setup.py
src/mailman/config/schema.cfg
src/mailman/pipeline/scrubber.py
=== modified file 'setup.py'
--- setup.py 2009-03-10 03:54:22 +0000
+++ setup.py 2009-03-10 04:06:16 +0000
@@ -85,8 +85,7 @@
package_dir = {'': 'src'},
include_package_data = True,
entry_points = {
- 'console_scripts' : list(scripts),
- 'mailman.scrubber' : 'stock = mailman.archiving.pipermail:Pipermail',
+ 'console_scripts' : list(scripts),
},
install_requires = [
'lazr.config',
=== modified file 'src/mailman/config/schema.cfg'
--- src/mailman/config/schema.cfg 2009-03-06 02:30:14 +0000
+++ src/mailman/config/schema.cfg 2009-03-10 04:06:16 +0000
@@ -475,14 +475,14 @@
[scrubber]
-# A filter module that converts from multipart messages to "flat" messages
+# A filter that converts from multipart messages to "flat" messages
# (i.e. containing a single payload). This is required for Pipermail, and you
# may want to set it to 0 for external archivers. You can also replace it
# with your own module as long as it contains a process() function that takes
# a MailList object and a Message object. It should raise
# Errors.DiscardMessage if it wants to throw the message away. Otherwise it
# should modify the Message object as necessary.
-archive_scrubber: mailman.pipeline.scrubber
+archive_scrubber: mailman.archiving.pipermail.Pipermail
# This variable defines what happens to text/html subparts. They can be
# stripped completely, escaped, or filtered through an external program. The
=== modified file 'src/mailman/pipeline/scrubber.py'
--- src/mailman/pipeline/scrubber.py 2009-02-13 01:36:21 +0000
+++ src/mailman/pipeline/scrubber.py 2009-03-10 04:06:16 +0000
@@ -27,6 +27,7 @@
import os
import re
+import sys
import time
import errno
import hashlib
@@ -45,7 +46,6 @@
from mailman.Utils import oneline, websafe
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.handler import IHandler
from mailman.utilities.filesystem import makedirs
@@ -486,7 +486,10 @@
fp.write(decodedpayload)
fp.close()
# Now calculate the url to the list's archive.
- baseurl = get_plugin('mailman.scrubber').list_url(mlist)
+ scrubber_path = config.scrubber.archive_scrubber
+ package_name, module_name = scrubber_path.rsplit('.', 1)
+ __import__(package_name)
+ baseurl = getattr(sys.modules[package_name], module_name).list_url(mlist)
if not baseurl.endswith('/'):
baseurl += '/'
# Trailing space will definitely be a problem with format=flowed.
--
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
