deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

handle unicode body in send_email

Browse Source
This commit is contained in:
Jay Lee
2020-04-01 09:20:38 -04:00
parent 309308ed59
commit 86b0ed0a04
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gam.py
View File

@@ -8748,6 +8748,8 @@ def send_email(subject, body, recipient=None, sender=None, user=None, method='se
if not user: if not user:
user = _getValueFromOAuth('email') user = _getValueFromOAuth('email')
userId, gmail = buildGmailGAPIObject(user) userId, gmail = buildGmailGAPIObject(user)
if not gmail:
return
resource = gmail.users().messages() resource = gmail.users().messages()
if labels: if labels:
api_body['labelIds'] = labelsToLabelIds(gmail, labels) api_body['labelIds'] = labelsToLabelIds(gmail, labels)
@@ -8757,6 +8759,11 @@ def send_email(subject, body, recipient=None, sender=None, user=None, method='se
if not recipient: if not recipient:
recipient = userId recipient = userId
default_recipient = True default_recipient = True
# Force ASCII for RFC compliance
# xmlcharref seems to work to display at least
# some unicode in HTML body and is ignored in
# plain text body.
body = body.encode('ascii', 'xmlcharrefreplace').decode()
msg = message_from_string(body) msg = message_from_string(body)
for header, value in msgHeaders.items(): for header, value in msgHeaders.items():
msg.__delitem__(header) # can remove multiple case-insensitive matching headers msg.__delitem__(header) # can remove multiple case-insensitive matching headers