Use unicode literal to join unicode strings.

Conflicts:
	Milter/utils.py
This commit is contained in:
Stuart D. Gathman
2016-07-25 22:35:20 -04:00
committed by Scott Kitterman
parent bf327f95e0
commit 702c6c126f
+2 -2
View File
@@ -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)