1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

decode(), encode(): Accepting the minor optimizations from SF patch

Browse Source 
#486375, but not the rest of it, since that changes the documented
semantics of encode().
This commit is contained in:
Barry Warsaw 2001-12-03 19:26:40 +00:00
parent be5234610a
commit c44d2c52c9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/email/Utils.py
View File

@ -75,14 +75,14 @@ def decode(s):
# The first element is any non-encoded leading text # The first element is any non-encoded leading text
rtn.append(parts[0]) rtn.append(parts[0])
charset = parts[1] charset = parts[1]
encoding = parts[2] encoding = parts[2].lower()
atom = parts[3] atom = parts[3]
# The next chunk to decode should be in parts[4] # The next chunk to decode should be in parts[4]
parts = ecre.split(parts[4]) parts = ecre.split(parts[4])
# The encoding must be either `q' or `b', case-insensitive # The encoding must be either `q' or `b', case-insensitive
if encoding.lower() == 'q': if encoding == 'q':
func = _qdecode func = _qdecode
elif encoding.lower() == 'b': elif encoding == 'b':
func = _bdecode func = _bdecode
else: else:
func = _identity func = _identity
@ -96,13 +96,14 @@ def decode(s):
def encode(s, charset='iso-8859-1', encoding='q'): def encode(s, charset='iso-8859-1', encoding='q'):
"""Encode a string according to RFC 2047.""" """Encode a string according to RFC 2047."""
if encoding.lower() == 'q': encoding = encoding.lower()
if encoding == 'q':
estr = _qencode(s) estr = _qencode(s)
elif encoding.lower() == 'b': elif encoding == 'b':
estr = _bencode(s) estr = _bencode(s)
else: else:
raise ValueError, 'Illegal encoding code: ' + encoding raise ValueError, 'Illegal encoding code: ' + encoding
return '=?%s?%s?%s?=' % (charset.lower(), encoding.lower(), estr) return '=?%s?%s?%s?=' % (charset.lower(), encoding, estr)