diff options
Diffstat (limited to 'src/mailman/runners')
| -rw-r--r-- | src/mailman/runners/digest.py | 8 | ||||
| -rw-r--r-- | src/mailman/runners/tests/test_confirm.py | 2 | ||||
| -rw-r--r-- | src/mailman/runners/tests/test_join.py | 6 | ||||
| -rw-r--r-- | src/mailman/runners/tests/test_lmtp.py | 11 |
4 files changed, 11 insertions, 16 deletions
diff --git a/src/mailman/runners/digest.py b/src/mailman/runners/digest.py index 99710dff5..f87dd4e76 100644 --- a/src/mailman/runners/digest.py +++ b/src/mailman/runners/digest.py @@ -318,9 +318,9 @@ class DigestRunner(Runner): """See `IRunner`.""" volume = msgdata['volume'] digest_number = msgdata['digest_number'] - with nested(Mailbox(msgdata['digest_path']), - _.using(mlist.preferred_language.code)) as (mailbox, - language_code): + # Backslashes make me cry. + with Mailbox(msgdata['digest_path']) as mailbox, \ + _.using(mlist.preferred_language.code): # Create the digesters. mime_digest = MIMEDigester(mlist, volume, digest_number) rfc1153_digest = RFC1153Digester(mlist, volume, digest_number) @@ -354,7 +354,7 @@ class DigestRunner(Runner): # receive. digest_members = set(mlist.digest_members.members) for member in digest_members: - if member.delivery_status <> DeliveryStatus.enabled: + if member.delivery_status is not DeliveryStatus.enabled: continue # Send the digest to the case-preserved address of the digest # members. diff --git a/src/mailman/runners/tests/test_confirm.py b/src/mailman/runners/tests/test_confirm.py index 62171979c..78f6a382c 100644 --- a/src/mailman/runners/tests/test_confirm.py +++ b/src/mailman/runners/tests/test_confirm.py @@ -28,6 +28,7 @@ __all__ = [ import unittest from datetime import datetime +from email.iterators import body_line_iterator from zope.component import getUtility from mailman.app.lifecycle import create_list @@ -37,7 +38,6 @@ from mailman.interfaces.registrar import IRegistrar from mailman.interfaces.usermanager import IUserManager from mailman.runners.command import CommandRunner from mailman.testing.helpers import ( - body_line_iterator, get_queue_messages, make_testable_runner, specialized_message_from_string as mfs) diff --git a/src/mailman/runners/tests/test_join.py b/src/mailman/runners/tests/test_join.py index a584fd2c2..41adcc450 100644 --- a/src/mailman/runners/tests/test_join.py +++ b/src/mailman/runners/tests/test_join.py @@ -28,6 +28,7 @@ __all__ = [ import unittest +from email.iterators import body_line_iterator from zope.component import getUtility from mailman.app.lifecycle import create_list @@ -38,10 +39,7 @@ from mailman.interfaces.subscriptions import ISubscriptionService from mailman.interfaces.usermanager import IUserManager from mailman.runners.command import CommandRunner from mailman.testing.helpers import ( - body_line_iterator, - get_queue_messages, - make_testable_runner, - reset_the_world, + get_queue_messages, make_testable_runner, reset_the_world, specialized_message_from_string as mfs) from mailman.testing.layers import ConfigLayer diff --git a/src/mailman/runners/tests/test_lmtp.py b/src/mailman/runners/tests/test_lmtp.py index 46d4ed986..a502c317d 100644 --- a/src/mailman/runners/tests/test_lmtp.py +++ b/src/mailman/runners/tests/test_lmtp.py @@ -53,22 +53,19 @@ class TestLMTP(unittest.TestCase): def test_message_id_required(self): # The message is rejected if it does not have a Message-ID header. - try: + with self.assertRaises(smtplib.SMTPDataError) as cm: self._lmtp.sendmail('anne@example.com', ['test@example.com'], """\ From: anne@example.com To: test@example.com Subject: This has no Message-ID header """) - except smtplib.SMTPDataError as error: - pass - else: - raise AssertionError('SMTPDataError expected') # LMTP returns a 550: Requested action not taken: mailbox unavailable # (e.g., mailbox not found, no access, or command rejected for policy # reasons) - self.assertEqual(error.smtp_code, 550) - self.assertEqual(error.smtp_error, 'No Message-ID header provided') + self.assertEqual(cm.exception.smtp_code, 550) + self.assertEqual(cm.exception.smtp_error, + 'No Message-ID header provided') def test_message_id_hash_is_added(self): self._lmtp.sendmail('anne@example.com', ['test@example.com'], """\ |