mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Refs #23919 -- Removed default 'utf-8' argument for str.encode()/decode().

Browse Source
This commit is contained in:
Tim Graham
2017-02-07 12:05:47 -05:00
parent 21f13ff5b3
commit 500532c95d
32 changed files with 61 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/mail/message.py
View File

@@ -172,7 +172,7 @@ class SafeMIMEText(MIMEMixin, MIMEText):
def set_payload(self, payload, charset=None):
if charset == 'utf-8':
has_long_lines = any(
len(l.encode('utf-8')) > RFC5322_EMAIL_LINE_LENGTH_LIMIT
len(l.encode()) > RFC5322_EMAIL_LINE_LENGTH_LIMIT
for l in payload.splitlines()
)
# Quoted-Printable encoding has the side effect of shortening long
@@ -322,7 +322,7 @@ class EmailMessage:
if basetype == 'text':
if isinstance(content, bytes):
try:
content = content.decode('utf-8')
content = content.decode()
except UnicodeDecodeError:
# If mimetype suggests the file is text but it's
# actually binary, read() raises a UnicodeDecodeError.