Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 87191 via svnmerge from 

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

........
  r87191 | r.david.murray | 2010-12-12 15:06:19 -0500 (Sun, 12 Dec 2010) | 6 lines

  #243654: only create a new MIME boundary if we don't already have one.

  The rearranged code should do exactly what the old code did, but
  the new code avoids a potentially costly re computation in the case
  where a boundary already exists.
........
This commit is contained in:
R. David Murray 2010-12-12 20:32:19 +00:00
parent 0b883012c4
commit 910c52fcf4
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/email/generator.py
View File

@ -202,19 +202,13 @@ class Generator:
g = self.clone(s) g = self.clone(s)
g.flatten(part, unixfrom=False) g.flatten(part, unixfrom=False)
msgtexts.append(s.getvalue()) msgtexts.append(s.getvalue())
# Now make sure the boundary we've selected doesn't appear in any of
# the message texts.
alltext = NL.join(msgtexts)
# BAW: What about boundaries that are wrapped in double-quotes? # BAW: What about boundaries that are wrapped in double-quotes?
boundary = msg.get_boundary(failobj=_make_boundary(alltext)) boundary = msg.get_boundary()
# If we had to calculate a new boundary because the body text if not boundary:
# contained that string, set the new boundary. We don't do it # Create a boundary that doesn't appear in any of the
# unconditionally because, while set_boundary() preserves order, it # message texts.
# doesn't preserve newlines/continuations in headers. This is no big alltext = NL.join(msgtexts)
# deal in practice, but turns out to be inconvenient for the unittest msg.set_boundary(self._make_boundary(alltext))
# suite.
if msg.get_boundary() != boundary:
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