Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line
#9424: Replace deprecated assert* methods in the Python test suite.
........
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index e8dfbbc..2d6b51d 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -43,13 +43,13 @@
SPACE = ' '
-
+
def openfile(filename, *args, **kws):
path = os.path.join(os.path.dirname(landmark), 'data', filename)
return open(path, *args, **kws)
-
+
# Base test class
class TestEmailBase(unittest.TestCase):
def ndiffAssertEqual(self, first, second):
@@ -67,7 +67,7 @@
return email.message_from_file(fp)
-
+
# Test various aspects of the Message class's API
class TestMessageAPI(TestEmailBase):
def test_get_all(self):
@@ -505,7 +505,7 @@
bytes(x, 'raw-unicode-escape'))
-
+
# Test the email.encoders module
class TestEncoders(unittest.TestCase):
def test_encode_empty_payload(self):
@@ -534,7 +534,7 @@
msg = MIMEText('文', _charset='euc-jp')
eq(msg['content-transfer-encoding'], '7bit')
-
+
# Test long header wrapping
class TestLongHeaders(TestEmailBase):
def test_split_long_continuation(self):
@@ -913,7 +913,7 @@
""")
-
+
# Test mangling of "From " lines in the body of a message
class TestFromMangling(unittest.TestCase):
def setUp(self):
@@ -947,7 +947,7 @@
""")
-
+
# Test the basic MIMEAudio class
class TestMIMEAudio(unittest.TestCase):
def setUp(self):
@@ -994,7 +994,7 @@
header='foobar') is missing)
-
+
# Test the basic MIMEImage class
class TestMIMEImage(unittest.TestCase):
def setUp(self):
@@ -1035,7 +1035,7 @@
header='foobar') is missing)
-
+
# Test the basic MIMEApplication class
class TestMIMEApplication(unittest.TestCase):
def test_headers(self):
@@ -1052,7 +1052,7 @@
eq(msg.get_payload(decode=True), bytes)
-
+
# Test the basic MIMEText class
class TestMIMEText(unittest.TestCase):
def setUp(self):
@@ -1106,7 +1106,7 @@
self.assertRaises(UnicodeEncodeError, MIMEText, teststr)
-
+
# Test complicated multipart/* messages
class TestMultipart(TestEmailBase):
def setUp(self):
@@ -1478,10 +1478,10 @@
YXNkZg==
--===============0012394164==--""")
- self.assertEquals(m.get_payload(0).get_payload(), 'YXNkZg==')
+ self.assertEqual(m.get_payload(0).get_payload(), 'YXNkZg==')
-
+
# Test some badly formatted messages
class TestNonConformant(TestEmailBase):
def test_parse_missing_minor_type(self):
@@ -1595,7 +1595,7 @@
eq(msg.defects[0].line, ' Line 1\n')
-
+
# Test RFC 2047 header encoding and decoding
class TestRFC2047(TestEmailBase):
def test_rfc2047_multiline(self):
@@ -1661,7 +1661,7 @@
self.assertEqual(decode_header(s),
[(b'andr\xe9=zz', 'iso-8659-1')])
-
+
# Test the MIMEMessage class
class TestMIMEMessage(TestEmailBase):
def setUp(self):
@@ -1962,7 +1962,7 @@
msg = MIMEMultipart()
self.assertTrue(msg.is_multipart())
-
+
# A general test of parser->model->generator idempotency. IOW, read a message
# in, parse it into a message object tree, then without touching the tree,
# regenerate the plain text. The original text and the transformed text
@@ -1983,7 +1983,7 @@
eq(text, s.getvalue())
def test_parse_text_message(self):
- eq = self.assertEquals
+ eq = self.assertEqual
msg, text = self._msgobj('msg_01.txt')
eq(msg.get_content_type(), 'text/plain')
eq(msg.get_content_maintype(), 'text')
@@ -1995,7 +1995,7 @@
self._idempotent(msg, text)
def test_parse_untyped_message(self):
- eq = self.assertEquals
+ eq = self.assertEqual
msg, text = self._msgobj('msg_03.txt')
eq(msg.get_content_type(), 'text/plain')
eq(msg.get_params(), None)
@@ -2067,7 +2067,7 @@
self._idempotent(msg, text)
def test_content_type(self):
- eq = self.assertEquals
+ eq = self.assertEqual
unless = self.assertTrue
# Get a message object and reset the seek pointer for other tests
msg, text = self._msgobj('msg_05.txt')
@@ -2099,7 +2099,7 @@
eq(msg4.get_payload(), 'Yadda yadda yadda\n')
def test_parser(self):
- eq = self.assertEquals
+ eq = self.assertEqual
unless = self.assertTrue
msg, text = self._msgobj('msg_06.txt')
# Check some of the outer headers
@@ -2116,7 +2116,7 @@
eq(msg1.get_payload(), '\n')
-
+
# Test various other bits of the package's functionality
class TestMiscellaneous(TestEmailBase):
def test_message_from_string(self):
@@ -2440,7 +2440,7 @@
""")
-
+
# Test the iterator/generators
class TestIterators(TestEmailBase):
def test_body_line_iterator(self):
@@ -2530,7 +2530,7 @@
self.assertTrue(''.join([il for il, n in imt]) == ''.join(om))
-
+
class TestParsers(TestEmailBase):
def test_header_parser(self):
eq = self.assertEqual
@@ -2682,7 +2682,7 @@
msg = email.message_from_string(m)
self.assertTrue(msg.get_payload(0).get_payload().endswith('\r\n'))
-
+
class TestBase64(unittest.TestCase):
def test_len(self):
eq = self.assertEqual
@@ -2735,7 +2735,7 @@
eq(he('hello\nworld'), '=?iso-8859-1?b?aGVsbG8Kd29ybGQ=?=')
-
+
class TestQuopri(unittest.TestCase):
def setUp(self):
# Set of characters (as byte integers) that don't need to be encoded
@@ -2854,7 +2854,7 @@
two line""")
-
+
# Test the Charset class
class TestCharset(unittest.TestCase):
def tearDown(self):
@@ -2912,7 +2912,7 @@
self.assertRaises(errors.CharsetError, Charset, 'asc\xffii')
-
+
# Test multilingual MIME headers.
class TestHeader(TestEmailBase):
def test_simple(self):
@@ -3222,7 +3222,7 @@
raises(errors.HeaderParseError, decode_header, s)
-
+
# Test RFC 2231 header parameters (en/de)coding
class TestRFC2231(TestEmailBase):
def test_get_param(self):
@@ -3534,7 +3534,7 @@
eq(s, 'My Document For You')
-
+
# Tests to ensure that signed parts of an email are completely preserved, as
# required by RFC1847 section 2.1. Note that these are incomplete, because the
# email package does not currently always preserve the body. See issue 1670765.
@@ -3572,7 +3572,7 @@
self._signed_parts_eq(original, result)
-
+
def _testclasses():
mod = sys.modules[__name__]
return [getattr(mod, name) for name in dir(mod) if name.startswith('Test')]
@@ -3590,6 +3590,6 @@
run_unittest(testclass)
-
+
if __name__ == '__main__':
unittest.main(defaultTest='suite')