From: Berker Peksag <berker.peksag@gmail.com>
Date: Thu, 8 Sep 2016 16:42:11 +0000 (+0300)
Subject: Issue #27445: Merge from 3.5
X-Git-Tag: v3.6.0b1~285
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8b7770a0e4a79280a3b5346ae8a6593ea74facf;p=thirdparty%2FPython%2Fcpython.git

Issue #27445: Merge from 3.5
---

d8b7770a0e4a79280a3b5346ae8a6593ea74facf
diff --cc Lib/email/mime/text.py
index 87de8d235f90,da03086ee8a7..35b442383002
--- a/Lib/email/mime/text.py
+++ b/Lib/email/mime/text.py
@@@ -35,10 -35,8 +35,8 @@@ class MIMEText(MIMENonMultipart)
                  _charset = 'us-ascii'
              except UnicodeEncodeError:
                  _charset = 'utf-8'
-         if isinstance(_charset, Charset):
-             _charset = str(_charset)
  
 -        MIMENonMultipart.__init__(self, 'text', _subtype,
 +        MIMENonMultipart.__init__(self, 'text', _subtype, policy=policy,
-                                   **{'charset': _charset})
+                                   **{'charset': str(_charset)})
  
          self.set_payload(_text, _charset)
diff --cc Misc/NEWS
index 1fc6d638f376,a18ceb674e87..b03e3d54558a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -92,9 -39,30 +92,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #27445: Don't pass str(_charset) to MIMEText.set_payload().
+   Patch by Claude Paroz.
+ 
 +- Issue #24277: The new email API is no longer provisional, and the docs
 +  have been reorganized and rewritten to emphasize the new API.
 +
  - lib2to3.pgen3.driver.load_grammar() now creates a stable cache file
    between runs given the same Grammar.txt input regardless of the hash
    randomization setting.