summaryrefslogtreecommitdiff
path: root/Mailman/Handlers
diff options
context:
space:
mode:
authorBarry Warsaw2007-12-29 17:02:46 -0500
committerBarry Warsaw2007-12-29 17:02:46 -0500
commit68cce110887cc9fc46fd4c7798f3b8d893f1038f (patch)
tree8bd390bd78a2b22c5be19540eb7d7bee503c478b /Mailman/Handlers
parent9124e1a17f439314b17206f2ad80f17d7b7971e8 (diff)
downloadmailman-68cce110887cc9fc46fd4c7798f3b8d893f1038f.tar.gz
mailman-68cce110887cc9fc46fd4c7798f3b8d893f1038f.tar.zst
mailman-68cce110887cc9fc46fd4c7798f3b8d893f1038f.zip
Port the implicit destination checking to the rules infrastructure and add a
bunch of doctests. Note that the old Hold Notification tests are temporarily disabled as these will have to be rewritten when the rule matching logic gets added.
Diffstat (limited to 'Mailman/Handlers')
-rw-r--r--Mailman/Handlers/Hold.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/Mailman/Handlers/Hold.py b/Mailman/Handlers/Hold.py
index 17f49ce11..12bab8a8b 100644
--- a/Mailman/Handlers/Hold.py
+++ b/Mailman/Handlers/Hold.py
@@ -43,8 +43,7 @@ from Mailman import Errors
from Mailman import Message
from Mailman import Utils
from Mailman import i18n
-from Mailman.app.bounces import (
- has_explicit_destination, has_matching_bounce_header)
+from Mailman.app.bounces import has_matching_bounce_header
from Mailman.app.moderator import hold_message
from Mailman.app.replybot import autorespond_to_sender
from Mailman.configuration import config
@@ -158,15 +157,6 @@ def process(mlist, msg, msgdata):
if not sender or sender[:len(listname)+6] == adminaddr:
sender = msg.get_sender(use_envelope=0)
#
- # Implicit destination? Note that message originating from the Usenet
- # side of the world should never be checked for implicit destination.
- if mlist.require_explicit_destination and \
- not has_explicit_destination(mlist, msg) and \
- not msgdata.get('fromusenet'):
- # then
- hold_for_approval(mlist, msg, msgdata, ImplicitDestination)
- # no return
- #
# Suspicious headers?
if mlist.bounce_matching_headers:
triggered = has_matching_bounce_header(mlist, msg)