150 if not self.__session: |
145 if not self.__session: |
151 self.__startSession() |
146 self.__startSession() |
152 else: |
147 else: |
153 self.__doSendMessages() |
148 self.__doSendMessages() |
154 |
149 |
155 def __prepareMessage_v2(self, message): |
150 def __prepareMessage(self, message): |
156 """ |
|
157 Private method to prepare the message for sending (Python2 Variant). |
|
158 |
|
159 @param message message to be prepared |
|
160 @type email.mime.text.MIMEBase |
|
161 @return prepared message dictionary |
|
162 @rtype dict |
|
163 """ |
|
164 raw = base64.urlsafe_b64encode(message.as_string()) |
|
165 return {'raw': raw} |
|
166 |
|
167 def __prepareMessage_v3(self, message): |
|
168 """ |
151 """ |
169 Private method to prepare the message for sending (Python2 Variant). |
152 Private method to prepare the message for sending (Python2 Variant). |
170 |
153 |
171 @param message message to be prepared |
154 @param message message to be prepared |
172 @type email.mime.text.MIMEBase |
155 @type email.mime.text.MIMEBase |
279 cache_discovery=False) |
262 cache_discovery=False) |
280 count = 0 |
263 count = 0 |
281 while self.__messages: |
264 while self.__messages: |
282 count += 1 |
265 count += 1 |
283 message = self.__messages.pop(0) |
266 message = self.__messages.pop(0) |
284 if sys.version_info[0] == 2: |
267 message1 = self.__prepareMessage(message) |
285 message1 = self.__prepareMessage_v2(message) |
|
286 else: |
|
287 message1 = self.__prepareMessage_v3(message) |
|
288 service.users().messages()\ |
268 service.users().messages()\ |
289 .send(userId="me", body=message1).execute() |
269 .send(userId="me", body=message1).execute() |
290 results.append(self.tr("Message #{0} sent.").format(count)) |
270 results.append(self.tr("Message #{0} sent.").format(count)) |
291 |
271 |
292 self.sendResult.emit(True, "\n\n".join(results)) |
272 self.sendResult.emit(True, "\n\n".join(results)) |