diff options
| author | Barry Warsaw | 2014-12-15 16:36:48 -0500 |
|---|---|---|
| committer | Barry Warsaw | 2014-12-15 16:36:48 -0500 |
| commit | e3b97fadcf345604c9760113ddf06505a2f3b95c (patch) | |
| tree | 3aa42c26cd2acf774781638a256c1e38007d58fd | |
| parent | 07cfcca716451335bfd14cdc9dca5c38ac1159b3 (diff) | |
| download | mailman-e3b97fadcf345604c9760113ddf06505a2f3b95c.tar.gz mailman-e3b97fadcf345604c9760113ddf06505a2f3b95c.tar.zst mailman-e3b97fadcf345604c9760113ddf06505a2f3b95c.zip | |
| -rw-r--r-- | src/mailman/app/docs/pipelines.rst | 8 | ||||
| -rw-r--r-- | src/mailman/handlers/cook_headers.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mailman/app/docs/pipelines.rst b/src/mailman/app/docs/pipelines.rst index adcdd1ea5..daedab50a 100644 --- a/src/mailman/app/docs/pipelines.rst +++ b/src/mailman/app/docs/pipelines.rst @@ -67,7 +67,7 @@ However there are currently no recipients for this message. >>> dump_msgdata(msgdata) original_sender : aperson@example.com original_subject: My first post - recipients : set([]) + recipients : set() stripped_subject: My first post After pipeline processing, the message is now sitting in various other @@ -97,7 +97,7 @@ processing queues. _parsemsg : False original_sender : aperson@example.com original_subject: My first post - recipients : set([]) + recipients : set() stripped_subject: My first post version : 3 @@ -132,10 +132,10 @@ delivered to end recipients. >>> dump_msgdata(messages[0].msgdata) _parsemsg : False - listname : test@example.com + listid : test.example.com original_sender : aperson@example.com original_subject: My first post - recipients : set([]) + recipients : set() stripped_subject: My first post version : 3 diff --git a/src/mailman/handlers/cook_headers.py b/src/mailman/handlers/cook_headers.py index 5fdfc238b..1ab527bb4 100644 --- a/src/mailman/handlers/cook_headers.py +++ b/src/mailman/handlers/cook_headers.py @@ -270,7 +270,7 @@ def ch_oneline(headerstr): else: cset = 'utf-8' h = make_header(d) - ustr = h.decode('utf-8') + ustr = str(h) oneline = ''.join(ustr.splitlines()) return oneline.encode(cset, 'replace'), cset except (LookupError, UnicodeError, ValueError, HeaderParseError): |