From f632ad77d47e5d5e209d2bd5d9f3327169f1db0d Mon Sep 17 00:00:00 2001 From: Storm Date: Tue, 6 Mar 2018 09:04:56 -0700 Subject: [PATCH 1/2] smtplib login expects strings for username and password --- frappe/email/smtp.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/email/smtp.py b/frappe/email/smtp.py index 62d0dce95b..1f9b6fae0a 100644 --- a/frappe/email/smtp.py +++ b/frappe/email/smtp.py @@ -191,8 +191,7 @@ class SMTPServer: self._sess.ehlo() if self.login and self.password: - ret = self._sess.login((self.login or "").encode('utf-8'), - (self.password or "").encode('utf-8')) + ret = self._sess.login((self.login or ""), (self.password or "")) # check if logged correctly if ret[0]!=235: From 0074fda7590e64ce80d15f8afcad211cdf96b966 Mon Sep 17 00:00:00 2001 From: Storm Date: Tue, 6 Mar 2018 11:51:57 -0700 Subject: [PATCH 2/2] mimetype expects to be set to a string not bytes --- frappe/website/render.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/render.py b/frappe/website/render.py index 33163e6aa9..490fadd5c9 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -98,7 +98,7 @@ def get_static_file_response(): raise NotFound response = Response(wrap_file(frappe.local.request.environ, f), direct_passthrough=True) - response.mimetype = mimetypes.guess_type(frappe.flags.file_path)[0] or b'application/octet-stream' + response.mimetype = mimetypes.guess_type(frappe.flags.file_path)[0] or 'application/octet-stream' return response def build_response(path, data, http_status_code, headers=None):