From f579d5c290b80e00974e8c034f9d6dd697fcdfa6 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Sun, 30 Nov 2008 20:30:43 -0800 Subject: Now that Python 2.4 is the minimum and we will use more recent installed email packages, convert all the email message get_type() calls to get_content_type(). --- tests/test_handlers.py | 20 ++++++++++---------- tests/test_message.py | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/test_handlers.py b/tests/test_handlers.py index 17e5ec96..7b053c65 100644 --- a/tests/test_handlers.py +++ b/tests/test_handlers.py @@ -133,7 +133,7 @@ From: aperson@dom.ain eq(str(str(qmsg['subject'])), '_xtest post acknowledgement') eq(qmsg['to'], 'aperson@dom.ain') eq(qmsg['from'], '_xtest-bounces@dom.ain') - eq(qmsg.get_type(), 'text/plain') + eq(qmsg.get_content_type(), 'text/plain') eq(qmsg.get_param('charset'), 'us-ascii') msgid = qmsg['message-id'] self.failUnless(msgid.startswith(' """) MimeDel.process(self._mlist, msg, {}) - eq(msg.get_type(), 'text/plain') + eq(msg.get_content_type(), 'text/plain') eq(msg.get_payload(), '\n\n\n') def test_deep_structure(self): @@ -1265,13 +1265,13 @@ aaa payload = msg.get_payload() eq(len(payload), 3) part1 = msg.get_payload(0) - eq(part1.get_type(), 'text/plain') + eq(part1.get_content_type(), 'text/plain') eq(part1.get_payload(), 'A different message') part2 = msg.get_payload(1) - eq(part2.get_type(), 'image/gif') + eq(part2.get_content_type(), 'image/gif') eq(part2.get_payload(), 'zzz') part3 = msg.get_payload(2) - eq(part3.get_type(), 'image/gif') + eq(part3.get_content_type(), 'image/gif') eq(part3.get_payload(), 'aaa') def test_top_multipart_alternative(self): @@ -1292,7 +1292,7 @@ This is plain text --AAA-- """) MimeDel.process(self._mlist, msg, {}) - eq(msg.get_type(), 'text/plain') + eq(msg.get_content_type(), 'text/plain') eq(msg.get_payload(), 'This is plain text') diff --git a/tests/test_message.py b/tests/test_message.py index da6f8a08..6a4cc3d2 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2008 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -81,10 +81,10 @@ yadda yadda yadda # second message is the message/rfc822 attachment of the original # message. msg1 = qmsg.get_payload(0) - eq(msg1.get_type(), 'text/plain') + eq(msg1.get_content_type(), 'text/plain') eq(msg1.get_payload(), '[No bounce details are available]\n') msg2 = qmsg.get_payload(1) - eq(msg2.get_type(), 'message/rfc822') + eq(msg2.get_content_type(), 'message/rfc822') unless(not msg2.is_multipart()) msg3 = msg2.get_payload() eq(msg3.get_payload(), 'yadda yadda yadda\n') -- cgit v1.2.3