summaryrefslogtreecommitdiff
path: root/Lib/email/mime/text.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-09-08 19:40:30 +0300
committerBerker Peksag <berker.peksag@gmail.com>2016-09-08 19:40:30 +0300
commit2b2a9be9135be0135649a2a869856dbe4cc543f1 (patch)
treea6bd044be68769fe5f5ec96cea3554f8da89bfc9 /Lib/email/mime/text.py
parent82733fac8dca465a1f0eb8e82b3b3f53cc6da145 (diff)
downloadcpython-git-2b2a9be9135be0135649a2a869856dbe4cc543f1.tar.gz
Issue #27445: Don't pass str(_charset) to MIMEText.set_payload()
Patch by Claude Paroz.
Diffstat (limited to 'Lib/email/mime/text.py')
-rw-r--r--Lib/email/mime/text.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/email/mime/text.py b/Lib/email/mime/text.py
index 479928ec94..da03086ee8 100644
--- a/Lib/email/mime/text.py
+++ b/Lib/email/mime/text.py
@@ -35,10 +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,
- **{'charset': _charset})
+ **{'charset': str(_charset)})
self.set_payload(_text, _charset)