diff options
| author | Barry Warsaw <barry@python.org> | 2011-05-23 15:29:24 -0400 |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2011-05-23 15:29:24 -0400 |
| commit | 544fb3c1aea093f3be6e0142679c0f01ab316758 (patch) | |
| tree | ad1b5c56a1cd7de261e35819133502b4180278f0 /Lib/test/test_rfc822.py | |
| parent | 51228dcd1c23959cdd68712c8b2507bed4effccf (diff) | |
| parent | b5e277ca522d94bdbf1426bfd8c43fee2f8153f3 (diff) | |
| download | cpython-544fb3c1aea093f3be6e0142679c0f01ab316758.tar.gz | |
Null merge from 2.6 branch.
Diffstat (limited to 'Lib/test/test_rfc822.py')
| -rw-r--r-- | Lib/test/test_rfc822.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Lib/test/test_rfc822.py b/Lib/test/test_rfc822.py index a05325d253..d8a0280f51 100644 --- a/Lib/test/test_rfc822.py +++ b/Lib/test/test_rfc822.py @@ -16,23 +16,23 @@ class MessageTestCase(unittest.TestCase): def test_get(self): msg = self.create_message( 'To: "last, first" <userid@foo.net>\n\ntest\n') - self.assert_(msg.get("to") == '"last, first" <userid@foo.net>') - self.assert_(msg.get("TO") == '"last, first" <userid@foo.net>') - self.assert_(msg.get("No-Such-Header") is None) - self.assert_(msg.get("No-Such-Header", "No-Such-Value") + self.assertTrue(msg.get("to") == '"last, first" <userid@foo.net>') + self.assertTrue(msg.get("TO") == '"last, first" <userid@foo.net>') + self.assertTrue(msg.get("No-Such-Header") is None) + self.assertTrue(msg.get("No-Such-Header", "No-Such-Value") == "No-Such-Value") def test_setdefault(self): msg = self.create_message( 'To: "last, first" <userid@foo.net>\n\ntest\n') - self.assert_(not msg.has_key("New-Header")) - self.assert_(msg.setdefault("New-Header", "New-Value") == "New-Value") - self.assert_(msg.setdefault("New-Header", "Different-Value") + self.assertTrue(not msg.has_key("New-Header")) + self.assertTrue(msg.setdefault("New-Header", "New-Value") == "New-Value") + self.assertTrue(msg.setdefault("New-Header", "Different-Value") == "New-Value") - self.assert_(msg["new-header"] == "New-Value") + self.assertTrue(msg["new-header"] == "New-Value") - self.assert_(msg.setdefault("Another-Header") == "") - self.assert_(msg["another-header"] == "") + self.assertTrue(msg.setdefault("Another-Header") == "") + self.assertTrue(msg["another-header"] == "") def check(self, msg, results): """Check addresses and the date.""" |