cpython/Lib/email
R. David Murray e85200d555 Merged revisions 80800 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

It turns out that email5 (py3k), because it is using unicode for the
payload, doesn't do the encoding to the output character set until later
in the process.  Specifically, charset.body_encode no longer does the
input-to-output charset conversion.  So the if test in the exception
clause in encoders.encode_7or8bit really is needed in email5.

So, this merge only merges the test, not the removal of the 'if'.

........
  r80800 | r.david.murray | 2010-05-05 13:31:03 -0400 (Wed, 05 May 2010) | 9 lines

  Issue #7472: remove unused code from email.encoders.encode_7or8bit.

  Yukihiro Nakadaira noticed a typo in encode_7or8bit that was trying
  to special case iso-2022 codecs.  It turns out that the code in
  question is never used, because whereas it was designed to trigger
  if the payload encoding was eight bit but its output encoding was
  7 bit, in practice the payload is always converted to the 7bit
  encoding before encode_7or8bit is called.  Patch by Shawat Anand.
........
2010-05-06 01:41:14 +00:00
..
mime Merged revisions 73004,73439,73496,73509,73529,73564,73576-73577,73595-73596,73605 via svnmerge from 2009-06-28 17:22:03 +00:00
test Merged revisions 80800 via svnmerge from 2010-05-06 01:41:14 +00:00
__init__.py Copying the email package back, despite its failings. 2007-08-30 01:15:14 +00:00
_parseaddr.py Copying the email package back, despite its failings. 2007-08-30 01:15:14 +00:00
base64mime.py Merged revisions 73952 via svnmerge from 2009-07-12 16:43:19 +00:00
charset.py Oops. I copied a slightly older version of the email package from the sandbox. 2007-08-30 03:46:43 +00:00
encoders.py Merged revisions 79994 via svnmerge from 2010-04-12 14:48:58 +00:00
errors.py Copying the email package back, despite its failings. 2007-08-30 01:15:14 +00:00
feedparser.py Patch# 1258 by Christian Heimes: kill basestring. 2007-10-16 18:12:55 +00:00
generator.py Merged revisions 78274 via svnmerge from 2010-02-21 04:39:40 +00:00
header.py Merged revisions 73952 via svnmerge from 2009-07-12 16:43:19 +00:00
iterators.py Patch# 1258 by Christian Heimes: kill basestring. 2007-10-16 18:12:55 +00:00
message.py Merged revisions 80062 via svnmerge from 2010-04-14 18:59:18 +00:00
parser.py Patch for issue 2848, mostly by Humberto Diogenes, with a couple of 2008-06-12 04:06:45 +00:00
quoprimime.py Merged revisions 73952 via svnmerge from 2009-07-12 16:43:19 +00:00
utils.py Merged revisions 77209,77229,77359-77360,77371 via svnmerge from 2010-01-09 18:45:30 +00:00