From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 14 Mar 2012 07:03:27 +0000 (-0400)
Subject: Merge #14291: if a header has non-ascii unicode, default to CTE using utf-8
X-Git-Tag: v3.3.0a2~208
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2922835b0d499d6f6d108e89ccb424f74b54c71;p=python

Merge #14291: if a header has non-ascii unicode, default to CTE using utf-8

In Python2, if a unicode string was assigned as the value of a header,
email would automatically CTE encode it using the UTF8 charset.
This capability was lost in the Python3 translation, and this patch
restores it.

Patch by Ali Ikinci, assisted by R. David Murray.

I also added a fix for the mailbox test that was depending (with a comment
that it was a bad idea to so depend) on non-ASCII causing message_from_string
to raise an error.  It now uses support.patch to induce an error during
message serialization.
---

e2922835b0d499d6f6d108e89ccb424f74b54c71
diff --cc Misc/ACKS
index a11d4ebdd8,2b3dad5424..eeb61e08e0
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -468,8 -429,8 +468,9 @@@ Eric Hus
  Jeremy Hylton
  Gerhard Häring
  Fredrik Håård
 +Catalin Iacob
  Mihai Ibanescu
+ Ali Ikinci
  Lars Immisch
  Bobby Impollonia
  Meador Inge
diff --cc Misc/NEWS
index 9b4d2c2ef9,b4dcf82608..0d6cdbb13d
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -24,14 -22,11 +24,17 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #14291: Email now defaults to utf-8 for non-ASCII unicode headers
+   instead of raising an error.  This fixes a regression relative to 2.7.
+ 
 +- Issue #989712: Support using Tk without a mainloop.
 +
  - Issue #5219: Prevent event handler cascade in IDLE.
  
 +- Issue #3835: Refuse to use unthreaded Tcl in threaded Python.
 +
 +- Issue #2843: Add new Tk API to Tkinter.
 +
  - Issue #14184: Increase the default stack size for secondary threads on
    Mac OS X to avoid interpreter crashes when using threads on 10.7.