Kaydet (Commit) 98ef3006 authored tarafından Barry Warsaw's avatar Barry Warsaw

SF patch # 884030 by Amit Aronovitch; fixes the _subpart argument to match

documented semantics.
üst 3f98df07
# Copyright (C) 2002 Python Software Foundation # Copyright (C) 2002-2004 Python Software Foundation
# Author: barry@zope.com (Barry Warsaw) # Author: barry@python.org (Barry Warsaw)
"""Base class for MIME multipart/* type messages. """Base class for MIME multipart/* type messages.
""" """
...@@ -11,7 +11,8 @@ from email import MIMEBase ...@@ -11,7 +11,8 @@ from email import MIMEBase
class MIMEMultipart(MIMEBase.MIMEBase): class MIMEMultipart(MIMEBase.MIMEBase):
"""Base class for MIME multipart/* type messages.""" """Base class for MIME multipart/* type messages."""
def __init__(self, _subtype='mixed', boundary=None, *_subparts, **_params): def __init__(self, _subtype='mixed', boundary=None, _subparts=None,
**_params):
"""Creates a multipart/* type message. """Creates a multipart/* type message.
By default, creates a multipart/mixed message, with proper By default, creates a multipart/mixed message, with proper
...@@ -24,7 +25,7 @@ class MIMEMultipart(MIMEBase.MIMEBase): ...@@ -24,7 +25,7 @@ class MIMEMultipart(MIMEBase.MIMEBase):
calculated as needed. calculated as needed.
_subparts is a sequence of initial subparts for the payload. It _subparts is a sequence of initial subparts for the payload. It
must be possible to convert this sequence to a list. You can always must be an iterable object, such as a list. You can always
attach new subparts to the message by using the attach() method. attach new subparts to the message by using the attach() method.
Additional parameters for the Content-Type header are taken from the Additional parameters for the Content-Type header are taken from the
...@@ -32,6 +33,7 @@ class MIMEMultipart(MIMEBase.MIMEBase): ...@@ -32,6 +33,7 @@ class MIMEMultipart(MIMEBase.MIMEBase):
""" """
MIMEBase.MIMEBase.__init__(self, 'multipart', _subtype, **_params) MIMEBase.MIMEBase.__init__(self, 'multipart', _subtype, **_params)
if _subparts: if _subparts:
self.attach(*list(_subparts)) for p in _subparts:
self.attach(p)
if boundary: if boundary:
self.set_boundary(boundary) self.set_boundary(boundary)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment