summaryrefslogtreecommitdiff
path: root/Mailman/app/moderator.py
diff options
context:
space:
mode:
authorBarry Warsaw2008-01-21 00:26:55 -0500
committerBarry Warsaw2008-01-21 00:26:55 -0500
commit4460aad316db5c8af9b84c392e67441acaac9d72 (patch)
treeeabc714fdc3c9aff16ca48cfbc5f7974af01e1c1 /Mailman/app/moderator.py
parent2efcac1ef273b407668826c587c15a0fd8ec3d3c (diff)
downloadmailman-4460aad316db5c8af9b84c392e67441acaac9d72.tar.gz
mailman-4460aad316db5c8af9b84c392e67441acaac9d72.tar.zst
mailman-4460aad316db5c8af9b84c392e67441acaac9d72.zip
More updates to rules and chains, especially by adding additional tests.
- Remove the Emergency.py handler. This is now covered by the emergency.py rule. - Remove the hold.txt doctest. This is now covered by the chains.txt and emergency.txt doctests. - Added a chains.txt doctest. - Extend the pending db to handle list values, although only lists that contain nothing but strings. - Rename the 'adminapproved' message metadata key (for the emergency rule) to 'moderator_approved'. Also, backport a change to the Decorate handler where message metadata on the 'decoration-data' key ca be used in the header and footer.
Diffstat (limited to 'Mailman/app/moderator.py')
-rw-r--r--Mailman/app/moderator.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/Mailman/app/moderator.py b/Mailman/app/moderator.py
index 956dfb773..29577a130 100644
--- a/Mailman/app/moderator.py
+++ b/Mailman/app/moderator.py
@@ -127,10 +127,8 @@ def handle_message(mlist, id, action,
if key.startswith('_mod_'):
del msgdata[key]
# Add some metadata to indicate this message has now been approved.
- # XXX 'adminapproved' is used for backward compatibility, but it
- # should really be called 'moderator_approved'.
msgdata['approved'] = True
- msgdata['adminapproved'] = True
+ msgdata['moderator_approved'] = True
# Calculate a new filebase for the approved message, otherwise
# delivery errors will cause duplicates.
if 'filebase' in msgdata: