mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 16:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 87415 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87415 | r.david.murray | 2010-12-21 13:07:59 -0500 (Tue, 21 Dec 2010) | 4 lines

  Fix the change made for issue 1243654.

  Surprisingly, it turns out there was no test that exercised this code path.
........
This commit is contained in:
R. David Murray 2010-12-21 18:12:50 +00:00
parent da29acd96d
commit a993b2d5de
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/email/generator.py
View file

@ -208,7 +208,8 @@ class Generator:
# Create a boundary that doesn't appear in any of the # Create a boundary that doesn't appear in any of the
# message texts. # message texts.
alltext = NL.join(msgtexts) alltext = NL.join(msgtexts)
msg.set_boundary(self._make_boundary(alltext)) boundary = _make_boundary(alltext)
msg.set_boundary(boundary)
# If there's a preamble, write it out, with a trailing CRLF # If there's a preamble, write it out, with a trailing CRLF
if msg.preamble is not None: if msg.preamble is not None:
print >> self._fp, msg.preamble print >> self._fp, msg.preamble

11
Lib/email/test/test_email.py
View file

@ -179,6 +179,17 @@ class TestMessageAPI(TestEmailBase):
self.assertRaises(Errors.HeaderParseError, self.assertRaises(Errors.HeaderParseError,
msg.set_boundary, 'BOUNDARY') 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): def test_message_rfc822_only(self):
# Issue 7970: message/rfc822 not in multipart parsed by # Issue 7970: message/rfc822 not in multipart parsed by
# HeaderParser caused an exception when flattened. # HeaderParser caused an exception when flattened.