merge 3.4

This commit is contained in:
Georg Brandl 2014-10-02 12:35:54 +02:00
commit 1f31583566
1 changed files with 1 additions and 1 deletions

View File

@ -12,7 +12,7 @@ from email.mime.base import MIMEBase
class MIMENonMultipart(MIMEBase): class MIMENonMultipart(MIMEBase):
"""Base class for MIME multipart/* type messages.""" """Base class for MIME non-multipart type messages."""
def attach(self, payload): def attach(self, payload):
# The public API prohibits attaching multiple subparts to MIMEBase # The public API prohibits attaching multiple subparts to MIMEBase