Changeset 391 for python/trunk/Lib/email/mime

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/email/mime/application.py (modified) (1 diff)
• Lib/email/mime/nonmultipart.py (modified) (2 diffs)

python/trunk/Lib/email/mime/application.py

@@ -18 +18 @@
         """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

python/trunk/Lib/email/mime/nonmultipart.py

@@ -16 +16 @@
     """Base class for MIME multipart/* type messages."""
 
-    __pychecker__ = 'unusednames=payload'
-
     def attach(self, payload):
         # The public API prohibits attaching multiple subparts to MIMEBase
@@ -24 +22 @@
         raise errors.MultipartConversionError(
             'Cannot attach additional subparts to non-multipart/*')
-
-    del __pychecker__