commit 2b2a9be9135be0135649a2a869856dbe4cc543f1
author Berker Peksag <berker.peksag@gmail.com> Thu Sep 08 19:40:30 2016 +0300
committer Berker Peksag <berker.peksag@gmail.com> Thu Sep 08 19:40:30 2016 +0300
tree a6bd044be68769fe5f5ec96cea3554f8da89bfc9
parent 82733fac8dca465a1f0eb8e82b3b3f53cc6da145

Issue #27445: Don't pass str(_charset) to MIMEText.set_payload()

Patch by Claude Paroz.

Lib/email/mime/text.py

diff --git a/Lib/email/mime/text.py b/Lib/email/mime/text.py
index 479928e..da03086 100644
--- a/Lib/email/mime/text.py
+++ b/Lib/email/mime/text.py
@@ -35,10 +35,8 @@
                 _charset = 'us-ascii'
             except UnicodeEncodeError:
                 _charset = 'utf-8'
-        if isinstance(_charset, Charset):
-            _charset = str(_charset)
 
         MIMENonMultipart.__init__(self, 'text', _subtype,
-                                  **{'charset': _charset})
+                                  **{'charset': str(_charset)})
 
         self.set_payload(_text, _charset)