summaryrefslogtreecommitdiff
path: root/Lib/email/base64mime.py
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-07-12 16:43:19 +0000
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-07-12 16:43:19 +0000
commit1c25de69ee63c80e6a6640a941b44f623d271a0e (patch)
treebc9095cadde93dbddf4a8020ab7d37e7007d3d66 /Lib/email/base64mime.py
parentc9e6cecdce65a14803dbf539b5bf776edcced562 (diff)
downloadcpython-git-1c25de69ee63c80e6a6640a941b44f623d271a0e.tar.gz
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/base64mime.py')
-rw-r--r--Lib/email/base64mime.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/email/base64mime.py b/Lib/email/base64mime.py
index 28e2542520..6cbfdf6ad8 100644
--- a/Lib/email/base64mime.py
+++ b/Lib/email/base64mime.py
@@ -20,7 +20,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
+decoding. To deal with the various line wrapping issues, use the email.header
module.
"""
@@ -104,7 +104,7 @@ def decode(string):
This function does not parse a full MIME header value encoded with
base64 (like =?iso-8895-1?b?bmloISBuaWgh?=) -- please use the high
- level email.Header class for that functionality.
+ level email.header class for that functionality.
"""
if not string:
return bytes()