summaryrefslogtreecommitdiffstats
path: root/Lib/email
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-03-15 03:59:46 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-03-15 03:59:46 (GMT)
commit4969f709cc07088a40574c05724d83cddc8fafc7 (patch)
treeddb254d02f2bd0c4d9d7c141f5f95521669042a0 /Lib/email
parentc48c19afe031d0a35a3d5aacddad4e113e1aeaf0 (diff)
parent42da663e6fe7ecbb89b17d596c76812a91bb99a4 (diff)
downloadcpython-4969f709cc07088a40574c05724d83cddc8fafc7.zip
cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.gz
cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.bz2
#11515: Merge with 3.1.
Diffstat (limited to 'Lib/email')
-rw-r--r--Lib/email/mime/application.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/email/mime/application.py b/Lib/email/mime/application.py
index 6f8bb8a..f5c5905 100644
--- a/Lib/email/mime/application.py
+++ b/Lib/email/mime/application.py
@@ -17,7 +17,7 @@ class MIMEApplication(MIMENonMultipart):
_encoder=encoders.encode_base64, **_params):
"""Create an application/* type MIME document.
- _data is a string containing the raw applicatoin data.
+ _data is a string containing the raw application data.
_subtype is the MIME content type subtype, defaulting to
'octet-stream'.