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
+1 -1
View File
@@ -219,7 +219,7 @@ def parse_header(val):
u.append(unicode(s)) u.append(unicode(s))
else: else:
u.append(unicode(s)) u.append(unicode(s))
u = ''.join(u) u = u''.join(u)
for enc in ('us-ascii','iso-8859-1','utf-8'): for enc in ('us-ascii','iso-8859-1','utf-8'):
try: try:
return u.encode(enc) return u.encode(enc)