diff options
| author |   Guido van Rossum <guido@python.org> | 2007-05-02 19:09:54 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-05-02 19:09:54 +0000 |
| commit | ef87d6ed94780fe00250a551031023aeb2898365 (patch) | |
| tree | 1f8989aaaec7ec5f8b2f26498317f2022bf85531 /Lib/email/utils.py | |
| parent | Checkpoint. Manipulated things so that string literals are always (diff) | |
| download | cpython-ef87d6ed94780fe00250a551031023aeb2898365.tar.gz cpython-ef87d6ed94780fe00250a551031023aeb2898365.tar.bz2 cpython-ef87d6ed94780fe00250a551031023aeb2898365.zip | |
Rip out all the u"..." literals and calls to unicode().
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) |