summaryrefslogtreecommitdiff
path: root/Lib/email/generator.py
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-12-21 18:12:50 +0000
committerR. David Murray <rdmurray@bitdance.com>2010-12-21 18:12:50 +0000
commita993b2d5dee93909c4e2e0c77075f92ca560abf5 (patch)
tree580b1221deb8327d869e94772d9807970085fdc7 /Lib/email/generator.py
parentda29acd96d0446839718d0596af84e4039f7c5c2 (diff)
downloadcpython-git-a993b2d5dee93909c4e2e0c77075f92ca560abf5.tar.gz
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. ........
Diffstat (limited to 'Lib/email/generator.py')
-rw-r--r--Lib/email/generator.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index 717a6c6378..eb71044700 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -208,7 +208,8 @@ class Generator:
# 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