diff options
| -rw-r--r-- | Lib/email/generator.py | 3 | ||||
| -rw-r--r-- | Lib/email/test/test_email.py | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Lib/email/generator.py b/Lib/email/generator.py index 510f68b..9d33f1c 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -226,7 +226,8 @@ class Generator: # Create a boundary that doesn't appear in any of the # message texts. alltext = self._encoded_NL.join(msgtexts) - msg.set_boundary(self._make_boundary(alltext)) + boundary = self._make_boundary(alltext) + msg.set_boundary(boundary) # If there's a preamble, write it out, with a trailing CRLF if msg.preamble is not None: self.write(msg.preamble + self._NL) diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index e5eece2..a54c1a3 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -180,6 +180,17 @@ class TestMessageAPI(TestEmailBase): self.assertRaises(errors.HeaderParseError, msg.set_boundary, 'BOUNDARY') + def test_make_boundary(self): + msg = MIMEMultipart('form-data') + # Note that when the boundary gets created is an implementation + # detail and might change. + self.assertEqual(msg.items()[0][1], 'multipart/form-data') + # Trigger creation of boundary + msg.as_string() + self.assertEqual(msg.items()[0][1][:33], + 'multipart/form-data; boundary="==') + # XXX: there ought to be tests of the uniqueness of the boundary, too. + def test_message_rfc822_only(self): # Issue 7970: message/rfc822 not in multipart parsed by # HeaderParser caused an exception when flattened. |