diff options
| author | bwarsaw | 2000-06-20 05:40:36 +0000 |
|---|---|---|
| committer | bwarsaw | 2000-06-20 05:40:36 +0000 |
| commit | d70033da8af8991e6a9cf3dd58aa5c8f87c100e2 (patch) | |
| tree | aac300f8e380bf7e96ecb314bd1f809d92aef627 | |
| parent | 0d17969d2fae92d72bc60e065d7a4dde62793c84 (diff) | |
| download | mailman-d70033da8af8991e6a9cf3dd58aa5c8f87c100e2.tar.gz mailman-d70033da8af8991e6a9cf3dd58aa5c8f87c100e2.tar.zst mailman-d70033da8af8991e6a9cf3dd58aa5c8f87c100e2.zip | |
process(): Relax the search constraints even more. I've now seen two
slightly different bounce reports froma NMS 3.6 servers. We now
search just for multipart/* parts, and look only for message/*
sub-parts.
| -rw-r--r-- | Mailman/Bouncers/Netscape.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Mailman/Bouncers/Netscape.py b/Mailman/Bouncers/Netscape.py index 955cb075b..26fd89e7a 100644 --- a/Mailman/Bouncers/Netscape.py +++ b/Mailman/Bouncers/Netscape.py @@ -43,9 +43,12 @@ acre = re.compile( def process(msg): - if msg.gettype() <> 'multipart/report' or \ - msg.getparam('report-type') <> 'delivery-status': - # then + # Sigh. Some show NMS 3.6's show + # multipart/report; report-type=delivery-status + # and some show + # multipart/mixed; + # TBD: should we tighten this check? + if msg.getmaintype() <> 'multipart': return None boundary = msg.getparam('boundary') msg.fp.seek(0) @@ -69,7 +72,7 @@ def process(msg): # Not properly formatted MIME return None msg = mimetools.Message(s) - if msg.gettype() == 'message/delivery-status': + if msg.getmaintype() == 'message': break elif msg.gettype() <> 'text/plain': # we're looking at something else entirely |