summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-02 10:35:54 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-02 10:35:54 (GMT)
commit1f315835662d111adaf6df8652c59185fb863dc3 (patch)
tree4ed1f559f510bcb81c71be05f519cae170ebf25e
parentdf77518d8cb9d4bdec1fb8f84ccd73ffd2643067 (diff)
parent529452926b25f0461cc4a1da4ab85f0e6fdd661b (diff)
downloadcpython-1f315835662d111adaf6df8652c59185fb863dc3.zip
cpython-1f315835662d111adaf6df8652c59185fb863dc3.tar.gz
cpython-1f315835662d111adaf6df8652c59185fb863dc3.tar.bz2
merge 3.4
-rw-r--r--Lib/email/mime/nonmultipart.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/email/mime/nonmultipart.py b/Lib/email/mime/nonmultipart.py
index fc3b9eb..e1f5196 100644
--- a/Lib/email/mime/nonmultipart.py
+++ b/Lib/email/mime/nonmultipart.py
@@ -12,7 +12,7 @@ from email.mime.base import MIMEBase
class MIMENonMultipart(MIMEBase):
- """Base class for MIME multipart/* type messages."""
+ """Base class for MIME non-multipart type messages."""
def attach(self, payload):
# The public API prohibits attaching multiple subparts to MIMEBase