1
=== modified file 'src/mailman/rules/approved.py'
2
--- src/mailman/rules/approved.py	2014-01-01 14:59:42 +0000
3
+++ src/mailman/rules/approved.py	2014-11-30 10:31:24 +0000
4
@@ -73,7 +73,10 @@
5
73
            stripped = False
73
            stripped = False
6
74
            for part in typed_subpart_iterator(msg, 'text', 'plain'):
74
            for part in typed_subpart_iterator(msg, 'text', 'plain'):
7
75
                break
75
                break
9
76
            payload = part.get_payload(decode=True)
76
            if part is None:
10
77
                payload = None
11
78
            else:
12
79
                payload = part.get_payload(decode=True)
13
77
            if payload is not None:
80
            if payload is not None:
14
78
                charset = part.get_content_charset('us-ascii')
81
                charset = part.get_content_charset('us-ascii')
15
79
                payload = payload.decode(charset, 'replace')
82
                payload = payload.decode(charset, 'replace')
16
80
83
17
=== modified file 'src/mailman/rules/tests/test_approved.py'
18
--- src/mailman/rules/tests/test_approved.py	2014-01-01 14:59:42 +0000
19
+++ src/mailman/rules/tests/test_approved.py	2014-11-30 10:31:24 +0000
20
@@ -491,3 +491,34 @@
21
491
            self.assertFalse(result)
491
            self.assertFalse(result)
22
492
        self.assertEqual(self._mlist.moderator_password,
492
        self.assertEqual(self._mlist.moderator_password,
23
493
                         b'{plaintext}super secret')
493
                         b'{plaintext}super secret')
24
494
25
495
26
496
class TestApprovedNoPlainText(unittest.TestCase):
27
497
    """Test the approved handler with HTML-only messages."""
28
498
29
499
    layer = ConfigLayer
30
500
31
501
    def setUp(self):
32
502
        self._mlist = create_list('test@example.com')
33
503
        self._rule = approved.Approved()
34
504
35
505
    def test_noplaintext(self):
36
506
        # When the message body only contains HTML, the rule should not throw
37
507
        # AttributeError: 'NoneType' object has no attribute 'get_payload'
38
508
        # LP: #1158721
39
509
        msg = mfs("""\
40
510
From: anne@example.com
41
511
To: test@example.com
42
512
Subject: HTML only email
43
513
Message-ID: <ant>
44
514
MIME-Version: 1.0
45
515
Content-Type: text/html; charset="Windows-1251"
46
516
Content-Transfer-Encoding: 7bit
47
517
48
518
<HTML>
49
519
<BODY>
50
520
<P>This message contains only HTML, no plain/text part</P>
51
521
</BODY></HTML>
52
522
""")
53
523
        result = self._rule.check(self._mlist, msg, {})
54
524
        self.assertFalse(result)
Reviewer	Review Type	Date Requested	Status
Barry Warsaw		2014-11-30	Approve on 2014-12-04
Review via email: mp+243229@code.launchpad.net