From 702c6c126fc8c0358cb5d23ff0a6c75a8f8b94a2 Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Mon, 25 Jul 2016 22:35:20 -0400 Subject: [PATCH] Use unicode literal to join unicode strings. Conflicts: Milter/utils.py --- Milter/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Milter/utils.py b/Milter/utils.py index 6423f72..2bc7bfe 100644 --- a/Milter/utils.py +++ b/Milter/utils.py @@ -218,8 +218,8 @@ def parse_header(val): except LookupError: u.append(unicode(s)) else: - u.append(unicode(s)) - u = ''.join(u) + u.append(unicode(s)) + u = u''.join(u) for enc in ('us-ascii','iso-8859-1','utf-8'): try: return u.encode(enc)