diff options
author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-07-12 16:43:19 (GMT) |
---|---|---|
committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-07-12 16:43:19 (GMT) |
commit | 1c25de69ee63c80e6a6640a941b44f623d271a0e (patch) | |
tree | bc9095cadde93dbddf4a8020ab7d37e7007d3d66 /Lib/email/quoprimime.py | |
parent | c9e6cecdce65a14803dbf539b5bf776edcced562 (diff) | |
download | cpython-1c25de69ee63c80e6a6640a941b44f623d271a0e.zip cpython-1c25de69ee63c80e6a6640a941b44f623d271a0e.tar.gz cpython-1c25de69ee63c80e6a6640a941b44f623d271a0e.tar.bz2 |
Merged revisions 73952 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
(Only docstrings were modified, won't backport to 3.1)
........
r73952 | amaury.forgeotdarc | 2009-07-11 16:33:51 +0200 (sam., 11 juil. 2009) | 4 lines
#2622 Import errors in email.message, from a py2app standalone application.
Patch by Mads Kiilerich, Reviewed by Barry Warsaw.
........
Diffstat (limited to 'Lib/email/quoprimime.py')
-rw-r--r-- | Lib/email/quoprimime.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/email/quoprimime.py b/Lib/email/quoprimime.py index bf28d39..12df028 100644 --- a/Lib/email/quoprimime.py +++ b/Lib/email/quoprimime.py @@ -11,7 +11,7 @@ character set, but that includes some 8-bit characters that are normally not allowed in email bodies or headers. Quoted-printable is very space-inefficient for encoding binary files; use the -email.base64MIME module for that instead. +email.base64mime module for that instead. This module provides an interface to encode and decode both headers and bodies with quoted-printable encoding. @@ -23,7 +23,7 @@ in To:/From:/Cc: etc. fields, as well as Subject: lines. This module does not do the line wrapping or end-of-line character conversion necessary for proper internationalized headers; it only does dumb encoding and decoding. To deal with the various line -wrapping issues, use the email.Header module. +wrapping issues, use the email.header module. """ __all__ = [ @@ -291,7 +291,7 @@ def header_decode(s): This function does not parse a full MIME header value encoded with quoted-printable (like =?iso-8895-1?q?Hello_World?=) -- please use - the high level email.Header class for that functionality. + the high level email.header class for that functionality. """ s = s.replace('_', ' ') return re.sub(r'=\w{2}', _unquote_match, s, re.ASCII) |