diff options
author | Barry Warsaw <barry@list.org> | 2008-12-01 23:25:33 -0500 |
---|---|---|
committer | Barry Warsaw <barry@list.org> | 2008-12-01 23:25:33 -0500 |
commit | 2da8819928e6b010eb6c9d34c71a4f9f0287af9b (patch) | |
tree | 7ad0054577c7e457a94ecec5cd55d0003c2c2f08 /Mailman/Bouncers/GroupWise.py | |
parent | 0e6f7c1fc99eb7e35c23695bca2c17e757baf514 (diff) | |
parent | f579d5c290b80e00974e8c034f9d6dd697fcdfa6 (diff) | |
download | mailman2-2da8819928e6b010eb6c9d34c71a4f9f0287af9b.tar.gz mailman2-2da8819928e6b010eb6c9d34c71a4f9f0287af9b.tar.xz mailman2-2da8819928e6b010eb6c9d34c71a4f9f0287af9b.zip |
Merge Mark's changes to complete the Python 2.6 compatibility.
Diffstat (limited to 'Mailman/Bouncers/GroupWise.py')
-rw-r--r-- | Mailman/Bouncers/GroupWise.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mailman/Bouncers/GroupWise.py b/Mailman/Bouncers/GroupWise.py index 74116135..e5122f73 100644 --- a/Mailman/Bouncers/GroupWise.py +++ b/Mailman/Bouncers/GroupWise.py @@ -30,7 +30,7 @@ acre = re.compile(r'<(?P<addr>[^>]*)>') def find_textplain(msg): - if msg.get_type(msg.get_default_type()) == 'text/plain': + if msg.get_content_type() == 'text/plain': return msg if msg.is_multipart: for part in msg.get_payload(): @@ -44,7 +44,7 @@ def find_textplain(msg): def process(msg): - if msg.get_type() <> 'multipart/mixed' or not msg['x-mailer']: + if msg.get_content_type() <> 'multipart/mixed' or not msg['x-mailer']: return None if msg['x-mailer'][:3].lower() not in ('nov', 'ntm', 'int'): return None |