diff options
| author | R David Murray <rdmurray@bitdance.com> | 2012-04-09 01:00:27 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2012-04-09 01:00:27 (GMT) |
| commit | c988e242408ea793052320fc2174fd124f193a77 (patch) | |
| tree | a8a300d62ae2251e6380e7c89a955ae28d40e50c | |
| parent | 409d0a9e47e7873351e3f7b3e27cf646bc03de1a (diff) | |
| download | cpython-c988e242408ea793052320fc2174fd124f193a77.zip cpython-c988e242408ea793052320fc2174fd124f193a77.tar.gz cpython-c988e242408ea793052320fc2174fd124f193a77.tar.bz2 | |
Remove redundancy in listing of all mailbox classes in test_mailbox.
| -rw-r--r-- | Lib/test/test_mailbox.py | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py index 6979b5f..95f8e0d 100644 --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -22,6 +22,10 @@ except ImportError: class TestBase: + all_mailbox_types = (mailbox.Message, mailbox.MaildirMessage, + mailbox.mboxMessage, mailbox.MHMessage, + mailbox.BabylMessage, mailbox.MMDFMessage) + def _check_sample(self, msg): # Inspect a mailbox.Message representation of the sample message self.assertIsInstance(msg, email.message.Message) @@ -1337,9 +1341,7 @@ class TestMessage(TestBase, unittest.TestCase): # Copy self's format-specific data to other message formats. # This test is superficial; better ones are in TestMessageConversion. msg = self._factory() - for class_ in (mailbox.Message, mailbox.MaildirMessage, - mailbox.mboxMessage, mailbox.MHMessage, - mailbox.BabylMessage, mailbox.MMDFMessage): + for class_ in self.all_mailbox_types: other_msg = class_() msg._explain_to(other_msg) other_msg = email.message.Message() @@ -1571,35 +1573,27 @@ class TestMessageConversion(TestBase, unittest.TestCase): def test_plain_to_x(self): # Convert Message to all formats - for class_ in (mailbox.Message, mailbox.MaildirMessage, - mailbox.mboxMessage, mailbox.MHMessage, - mailbox.BabylMessage, mailbox.MMDFMessage): + for class_ in self.all_mailbox_types: msg_plain = mailbox.Message(_sample_message) msg = class_(msg_plain) self._check_sample(msg) def test_x_to_plain(self): # Convert all formats to Message - for class_ in (mailbox.Message, mailbox.MaildirMessage, - mailbox.mboxMessage, mailbox.MHMessage, - mailbox.BabylMessage, mailbox.MMDFMessage): + for class_ in self.all_mailbox_types: msg = class_(_sample_message) msg_plain = mailbox.Message(msg) self._check_sample(msg_plain) def test_x_from_bytes(self): # Convert all formats to Message - for class_ in (mailbox.Message, mailbox.MaildirMessage, - mailbox.mboxMessage, mailbox.MHMessage, - mailbox.BabylMessage, mailbox.MMDFMessage): + for class_ in self.all_mailbox_types: msg = class_(_bytes_sample_message) self._check_sample(msg) def test_x_to_invalid(self): # Convert all formats to an invalid format - for class_ in (mailbox.Message, mailbox.MaildirMessage, - mailbox.mboxMessage, mailbox.MHMessage, - mailbox.BabylMessage, mailbox.MMDFMessage): + for class_ in self.all_mailbox_types: self.assertRaises(TypeError, lambda: class_(False)) def test_maildir_to_maildir(self): |