diff options
Diffstat (limited to 'mailman/pipeline')
| -rw-r--r-- | mailman/pipeline/decorate.py | 6 | ||||
| -rw-r--r-- | mailman/pipeline/to_digest.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mailman/pipeline/decorate.py b/mailman/pipeline/decorate.py index 82851fbf1..e1fa0c155 100644 --- a/mailman/pipeline/decorate.py +++ b/mailman/pipeline/decorate.py @@ -106,11 +106,11 @@ def process(mlist, msg, msgdata): try: oldpayload = unicode(msg.get_payload(decode=True), mcset) del msg['content-transfer-encoding'] - frontsep = endsep = u'' + frontsep = endsep = '' if header and not header.endswith('\n'): - frontsep = u'\n' + frontsep = '\n' if footer and not oldpayload.endswith('\n'): - endsep = u'\n' + endsep = '\n' payload = header + frontsep + oldpayload + endsep + footer # When setting the payload for the message, try various charset # encodings until one does not produce a UnicodeError. We'll try diff --git a/mailman/pipeline/to_digest.py b/mailman/pipeline/to_digest.py index df2684986..b85764ac9 100644 --- a/mailman/pipeline/to_digest.py +++ b/mailman/pipeline/to_digest.py @@ -65,7 +65,7 @@ from mailman.pipeline.scrubber import process as scrubber _ = i18n._ -UEMPTYSTRING = u'' +UEMPTYSTRING = '' EMPTYSTRING = '' log = logging.getLogger('mailman.error') |