Use unicode literal to join unicode strings.
Conflicts: Milter/utils.py
This commit is contained in:
committed by
Scott Kitterman
parent
bf327f95e0
commit
702c6c126f
+2
-2
@@ -218,8 +218,8 @@ def parse_header(val):
|
|||||||
except LookupError:
|
except LookupError:
|
||||||
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)
|
||||||
|
|||||||
Reference in New Issue
Block a user