diff options
| author | Mark Sapiro <mark@msapiro.net> | 2008-02-19 20:26:57 -0800 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2008-02-19 20:26:57 -0800 |
| commit | 9ac7210487ec2bce4caca42ee4f8a17303aaabf5 (patch) | |
| tree | 4ab34736ad907daf908d86066ef3fb34bcfd199f /Mailman/Handlers/Moderate.py | |
| parent | 2aee687b29f28ef20703abcbe715d1b1d8e27546 (diff) | |
| download | mailman2-9ac7210487ec2bce4caca42ee4f8a17303aaabf5.tar.gz mailman2-9ac7210487ec2bce4caca42ee4f8a17303aaabf5.tar.xz mailman2-9ac7210487ec2bce4caca42ee4f8a17303aaabf5.zip | |
cmd_confirm.py - Modified to catch a UnicodeError that may occur under
obscure circumstances when scanning the message body
for "unprocessed" commands.
Moderate.py - Modified to not try to match "@listname" directly against
the sender address.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Handlers/Moderate.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py index 346437e8..ff99c8fd 100644 --- a/Mailman/Handlers/Moderate.py +++ b/Mailman/Handlers/Moderate.py @@ -117,8 +117,9 @@ def process(mlist, msg, msgdata): def matches_p(sender, nonmembers): - # First strip out all the regular expressions - plainaddrs = [addr for addr in nonmembers if not addr.startswith('^')] + # First strip out all the regular expressions and listnames + plainaddrs = [addr for addr in nonmembers if not (addr.startswith('^') + or addr.startswith('@'))] addrdict = Utils.List2Dict(plainaddrs, foldcase=1) if addrdict.has_key(sender): return 1 |