summaryrefslogtreecommitdiff
path: root/src/mailman/handlers/cook_headers.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/mailman/handlers/cook_headers.py')
-rw-r--r--src/mailman/handlers/cook_headers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mailman/handlers/cook_headers.py b/src/mailman/handlers/cook_headers.py
index d5d096448..5fdfc238b 100644
--- a/src/mailman/handlers/cook_headers.py
+++ b/src/mailman/handlers/cook_headers.py
@@ -201,7 +201,7 @@ def prefix_subject(mlist, msg, msgdata):
# range. It is safe to use unicode string when manupilating header
# contents with re module. It would be best to return unicode in
# ch_oneline() but here is temporary solution.
- subject = unicode(subject, cset)
+ subject = subject.decode(cset)
# If the subject_prefix contains '%d', it is replaced with the
# mailing list sequential number. Sequential number format allows
# '%d' or '%05d' like pattern.
@@ -270,7 +270,7 @@ def ch_oneline(headerstr):
else:
cset = 'utf-8'
h = make_header(d)
- ustr = unicode(h)
+ ustr = h.decode('utf-8')
oneline = ''.join(ustr.splitlines())
return oneline.encode(cset, 'replace'), cset
except (LookupError, UnicodeError, ValueError, HeaderParseError):