From b8803a51addf7454e3b4f9b1a95e931060fb86d3 Mon Sep 17 00:00:00 2001 From: Ashish Shah Date: Mon, 19 Aug 2019 18:34:52 +0530 Subject: [PATCH 1/3] Update receive.py --- frappe/email/receive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/receive.py b/frappe/email/receive.py index a95975c4b0..b61e03e247 100644 --- a/frappe/email/receive.py +++ b/frappe/email/receive.py @@ -484,7 +484,7 @@ class Email: if six.PY2: charset = chardet.detect(str(part))['encoding'] else: - charset = chardet.detect(part.encode())['encoding'] + charset = chardet.detect(frappe.safe_encode(str(part)))['encoding'] return charset From 4c7cbd6d7afe64375b5a2f3667dd4178d1d424ef Mon Sep 17 00:00:00 2001 From: Ashish Shah Date: Wed, 21 Aug 2019 12:01:06 +0530 Subject: [PATCH 2/3] Update receive.py --- frappe/email/receive.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frappe/email/receive.py b/frappe/email/receive.py index b61e03e247..b7a5a439d4 100644 --- a/frappe/email/receive.py +++ b/frappe/email/receive.py @@ -481,10 +481,7 @@ class Email: """Detect chartset.""" charset = part.get_content_charset() if not charset: - if six.PY2: - charset = chardet.detect(str(part))['encoding'] - else: - charset = chardet.detect(frappe.safe_encode(str(part)))['encoding'] + charset = chardet.detect(frappe.safe_encode(str(part)))['encoding'] return charset From 3eb6a22989e8a9a63e781b7d92cf4425e3ef039f Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Wed, 21 Aug 2019 13:28:14 +0530 Subject: [PATCH 3/3] fix: Remove unwanted str() --- frappe/email/receive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/receive.py b/frappe/email/receive.py index b7a5a439d4..2148e27520 100644 --- a/frappe/email/receive.py +++ b/frappe/email/receive.py @@ -481,7 +481,7 @@ class Email: """Detect chartset.""" charset = part.get_content_charset() if not charset: - charset = chardet.detect(frappe.safe_encode(str(part)))['encoding'] + charset = chardet.detect(frappe.safe_encode(part))['encoding'] return charset