diff options
Diffstat (limited to 'Lib/email/utils.py')
| -rw-r--r-- | Lib/email/utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/email/utils.py b/Lib/email/utils.py index ee952d392e2..de9fbf87a53 100644 --- a/Lib/email/utils.py +++ b/Lib/email/utils.py @@ -44,7 +44,7 @@ from email.encoders import _bencode, _qencode COMMASPACE = ', ' EMPTYSTRING = '' -UEMPTYSTRING = u'' +UEMPTYSTRING = '' CRLF = '\r\n' TICK = "'" @@ -315,9 +315,9 @@ def collapse_rfc2231_value(value, errors='replace', rawval = unquote(value[2]) charset = value[0] or 'us-ascii' try: - return unicode(rawval, charset, errors) + return str(rawval, charset, errors) except LookupError: # XXX charset is unknown to Python. - return unicode(rawval, fallback_charset, errors) + return str(rawval, fallback_charset, errors) else: return unquote(value) |