← Back to branch summary

~barry/mailman/lp1423756

« back to all changes in this revision

Viewing changes to src/mailman/rules/approved.py

  • Committer: Barry Warsaw
  • Date: 2015-01-05 01:20:33 UTC
  • mfrom: (7264.4.66 py3)
  • Revision ID: barry@list.org-20150105012033-zdrw9c2odhpf22fz
Merge the Python 3 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mailman/rules/approved.py
17
17
 
18
18
"""Look for moderator pre-approval."""
19
19
 
20
 
from __future__ import absolute_import, print_function, unicode_literals
21
 
 
22
 
__metaclass__ = type
23
20
__all__ = [
24
21
    'Approved',
25
22
    ]
28
25
import re
29
26
 
30
27
from email.iterators import typed_subpart_iterator
31
 
from zope.interface import implementer
32
 
 
33
28
from mailman.config import config
34
29
from mailman.core.i18n import _
35
30
from mailman.interfaces.rules import IRule
 
31
from zope.interface import implementer
36
32
 
37
33
 
38
34
EMPTYSTRING = ''
113
109
                # may not work with rtf or whatever else is possible.
114
110
                pattern = header + ':(\s| )*' + re.escape(password)
115
111
                for part in typed_subpart_iterator(msg, 'text'):
116
 
                    payload = part.get_payload(decode=True)
 
112
                    payload = part.get_payload()
117
113
                    if payload is not None:
118
114
                        if re.search(pattern, payload):
119
115
                            reset_payload(part, re.sub(pattern, '', payload))