[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/aedc3e7d1da7
changeset:   92759:aedc3e7d1da7
parent:      92757:433048fd4206
parent:      92758:41f46f7f2722
user:        Georg Brandl <georg at python.org>
date:        Thu Oct 02 12:35:54 2014 +0200
summary:
  merge 3.4

files:
  Lib/email/mime/nonmultipart.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/email/mime/nonmultipart.py b/Lib/email/mime/nonmultipart.py
--- a/Lib/email/mime/nonmultipart.py
+++ b/Lib/email/mime/nonmultipart.py
@@ -12,7 +12,7 @@
 
 

 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

-- 
Repository URL: https://hg.python.org/cpython