mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Port relevant patches for SF 1409455 to the trunk for email 3.0/Python 2.5.

Browse source 
Will port to Python 2.4.
This commit is contained in:
Barry Warsaw 2006-02-08 14:34:21 +00:00
parent a871ef2b3e
commit e58df82919
5 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/email/Generator.py
View file

@ -1,4 +1,4 @@
# Copyright (C) 2001-2004 Python Software Foundation
# Copyright (C) 2001-2006 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org
@ -175,9 +175,6 @@ class Generator:
payload = msg.get_payload()
if payload is None:
return
cset = msg.get_charset()
if cset is not None:
payload = cset.body_encode(payload)
if not isinstance(payload, basestring):
raise TypeError('string payload expected: %s' % type(payload))
if self._mangle_from_: