From: R David Murray <rdmurray@bitdance.com>
Date: Tue, 15 Mar 2011 16:24:47 +0000 (-0400)
Subject: Merge #11554 test_email_codecs activation from 3.2.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df1d00a1e3d5ec1ee994ab0b002b974f22a6eaa4;p=python

Merge #11554 test_email_codecs activation from 3.2.
---

df1d00a1e3d5ec1ee994ab0b002b974f22a6eaa4
diff --cc Misc/NEWS
index f9c4c9e1f4,adc719bf2f..85ec6d6c10
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -68,12 -34,9 +68,15 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11554: Fixed support for Japanese codecs; previously the body output
+   encoding was not done if euc-jp or shift-jis was specified as the charset.
+ 
 +- Issue #11509: Significantly increase test coverage of fileinput.
 +  Patch by Denver Coneybeare at PyCon 2011 Sprints.
 +
 +- Issue #11407: `TestCase.run` returns the result object used or created.
 +  Contributed by Janathan Hartley.
 +
  - Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified 
    IP addresses in the proxy exception list. 
  
@@@ -206,8 -102,8 +209,10 @@@ Tools/Demo
  Tests
  -----
  
+ - Issue #11554: Reactivated test_email_codecs.
+ 
 +- Issue #11505: improves test coverage of string.py
 +
  - Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a
    false positive if the last directory in the path is inaccessible.