Merged revisions 87415 via svnmerge from
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.
........
diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index 717a6c6..eb71044 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -208,7 +208,8 @@
             # Create a boundary that doesn't appear in any of the
             # message texts.
             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 msg.preamble is not None:
             print >> self._fp, msg.preamble