diff options
| -rw-r--r-- | src/mailman/email/tests/test_message.py | 3 | ||||
| -rw-r--r-- | src/mailman/rest/tests/test_helpers.py | 15 | ||||
| -rw-r--r-- | src/mailman/rules/no_subject.py | 2 | ||||
| -rw-r--r-- | src/mailman/rules/suspicious.py | 2 | ||||
| -rw-r--r-- | src/mailman/rules/tests/test_no_subject.py | 9 | ||||
| -rw-r--r-- | src/mailman/rules/tests/test_suspicious.py | 7 |
6 files changed, 13 insertions, 25 deletions
diff --git a/src/mailman/email/tests/test_message.py b/src/mailman/email/tests/test_message.py index c23d37f7f..461659865 100644 --- a/src/mailman/email/tests/test_message.py +++ b/src/mailman/email/tests/test_message.py @@ -53,7 +53,6 @@ class TestMessage(unittest.TestCase): class TestMessageSubclass(unittest.TestCase): - layer = ConfigLayer def test_i18n_filenames(self): @@ -88,4 +87,4 @@ Test content msg = Message() msg['From'] = Header('test@example.com') # Make sure the senders property does not fail - self.assertEqual(msg.senders, ["test@example.com"]) + self.assertEqual(msg.senders, ['test@example.com']) diff --git a/src/mailman/rest/tests/test_helpers.py b/src/mailman/rest/tests/test_helpers.py index 3f19a9e5e..07ae784c8 100644 --- a/src/mailman/rest/tests/test_helpers.py +++ b/src/mailman/rest/tests/test_helpers.py @@ -81,26 +81,19 @@ class TestHelpers(unittest.TestCase): class TestJSONEncoder(unittest.TestCase): """Test the JSON ExtendedEncoder.""" - layer = RESTLayer def test_encode_message(self): msg = Message() msg['From'] = 'test@example.com' msg.set_payload('Test content.') - try: - result = json.dumps(msg, cls=helpers.ExtendedEncoder) - except TypeError as e: - self.fail(e) + result = json.dumps(msg, cls=helpers.ExtendedEncoder) self.assertEqual( result, json.dumps('From: test@example.com\n\nTest content.')) def test_encode_header(self): value = 'Contains non-ascii \u00e9 \u00e7 \u00e0' - try: - result = json.dumps( - Header(value, charset='utf-8'), - cls=helpers.ExtendedEncoder) - except TypeError as e: - self.fail(e) + result = json.dumps( + Header(value, charset='utf-8'), + cls=helpers.ExtendedEncoder) self.assertEqual(result, json.dumps(value)) diff --git a/src/mailman/rules/no_subject.py b/src/mailman/rules/no_subject.py index e6a3be6ed..ed020b81e 100644 --- a/src/mailman/rules/no_subject.py +++ b/src/mailman/rules/no_subject.py @@ -34,7 +34,7 @@ class NoSubject: def check(self, mlist, msg, msgdata): """See `IRule`.""" - # Convert the header value to string because it may be an + # Convert the header value to a str because it may be an # email.header.Header instance. subject = str(msg.get('subject', '')).strip() return subject == '' diff --git a/src/mailman/rules/suspicious.py b/src/mailman/rules/suspicious.py index acb17334a..679605fd6 100644 --- a/src/mailman/rules/suspicious.py +++ b/src/mailman/rules/suspicious.py @@ -87,7 +87,7 @@ def has_matching_bounce_header(mlist, msg): """ for header, cre, line in _parse_matching_header_opt(mlist): for value in msg.get_all(header, []): - # Convert the header value to string because it may be an + # Convert the header value to a str because it may be an # email.header.Header instance. if cre.search(str(value)): return True diff --git a/src/mailman/rules/tests/test_no_subject.py b/src/mailman/rules/tests/test_no_subject.py index efe942af6..0155e25ee 100644 --- a/src/mailman/rules/tests/test_no_subject.py +++ b/src/mailman/rules/tests/test_no_subject.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 by the Free Software Foundation, Inc. +# Copyright (C) 2016 by the Free Software Foundation, Inc. # # This file is part of GNU Mailman. # @@ -17,7 +17,6 @@ """Test the `no_subject` header rule.""" - import unittest from email.header import Header @@ -37,15 +36,13 @@ class TestNoSubject(unittest.TestCase): self._rule = no_subject.NoSubject() def test_header_instance_empty(self): - # Check the case where the subject is a Header instance msg = Message() - msg["Subject"] = Header("") + msg['Subject'] = Header('') result = self._rule.check(self._mlist, msg, {}) self.assertTrue(result) def test_header_instance_not_empty(self): - # Check the case where the subject is a Header instance msg = Message() - msg["Subject"] = Header("Test subject") + msg['Subject'] = Header('Test subject') result = self._rule.check(self._mlist, msg, {}) self.assertFalse(result) diff --git a/src/mailman/rules/tests/test_suspicious.py b/src/mailman/rules/tests/test_suspicious.py index e1649928c..441fb0b48 100644 --- a/src/mailman/rules/tests/test_suspicious.py +++ b/src/mailman/rules/tests/test_suspicious.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 by the Free Software Foundation, Inc. +# Copyright (C) 2016 by the Free Software Foundation, Inc. # # This file is part of GNU Mailman. # @@ -28,7 +28,7 @@ from mailman.testing.layers import ConfigLayer class TestSuspicious(unittest.TestCase): - """Test the suspicous rule.""" + """Test the suspicious rule.""" layer = ConfigLayer @@ -37,9 +37,8 @@ class TestSuspicious(unittest.TestCase): self._rule = suspicious.SuspiciousHeader() def test_header_instance(self): - # Check the case where the subject is a Header instance msg = Message() - msg["From"] = Header("user@example.com") + msg['From'] = Header('user@example.com') self._mlist.bounce_matching_headers = 'from: spam@example.com' result = self._rule.check(self._mlist, msg, {}) self.assertFalse(result) |