diff -r 960850ec284c -r a22eee00b052 eric6/E5Network/E5GoogleMail.py
--- a/eric6/E5Network/E5GoogleMail.py Sat Aug 31 12:29:57 2019 +0200
+++ b/eric6/E5Network/E5GoogleMail.py Sat Aug 31 12:58:11 2019 +0200
@@ -8,13 +8,8 @@
"""
from __future__ import unicode_literals
-try:
- str = unicode # __IGNORE_EXCEPTION__
-except NameError:
- pass
import os
-import sys
import base64
import json
import datetime
@@ -152,19 +147,7 @@
else:
self.__doSendMessages()
- def __prepareMessage_v2(self, message):
- """
- Private method to prepare the message for sending (Python2 Variant).
-
- @param message message to be prepared
- @type email.mime.text.MIMEBase
- @return prepared message dictionary
- @rtype dict
- """
- raw = base64.urlsafe_b64encode(message.as_string())
- return {'raw': raw}
-
- def __prepareMessage_v3(self, message):
+ def __prepareMessage(self, message):
"""
Private method to prepare the message for sending (Python2 Variant).
@@ -281,10 +264,7 @@
while self.__messages:
count += 1
message = self.__messages.pop(0)
- if sys.version_info[0] == 2:
- message1 = self.__prepareMessage_v2(message)
- else:
- message1 = self.__prepareMessage_v3(message)
+ message1 = self.__prepareMessage(message)
service.users().messages()\
.send(userId="me", body=message1).execute()
results.append(self.tr("Message #{0} sent.").format(count))
