commit ef87d6ed94780fe00250a551031023aeb2898365
author Guido van Rossum <guido@python.org> Wed May 02 19:09:54 2007 +0000
committer Guido van Rossum <guido@python.org> Wed May 02 19:09:54 2007 +0000
tree 1f8989aaaec7ec5f8b2f26498317f2022bf85531
parent 572dbf8f1320c0b34b9c786e5c30ba4a4b61b292

Rip out all the u"..." literals and calls to unicode().

Lib/email/utils.py

diff --git a/Lib/email/utils.py b/Lib/email/utils.py
index ee952d3..de9fbf8 100644
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -44,7 +44,7 @@
 
 COMMASPACE = ', '
 EMPTYSTRING = ''
-UEMPTYSTRING = u''
+UEMPTYSTRING = ''
 CRLF = '\r\n'
 TICK = "'"
 
@@ -315,9 +315,9 @@
         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)