Fix no pydrive dependency installed
Fix sending email on python3
pull/591/head
OzzieIsaacs 6 years ago
parent fac0921acf
commit c38f331b6f

@ -34,7 +34,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for library,version in versions.iteritems() %} {% for library,version in versions.items() %}
<tr> <tr>
<th>{{library}}</th> <th>{{library}}</th>
<td>{{version}}</td> <td>{{version}}</td>

@ -2785,7 +2785,7 @@ def configuration_helper(origin):
app.logger.info('Reboot required, restarting') app.logger.info('Reboot required, restarting')
if origin: if origin:
success = True success = True
if is_gdrive_ready(): if is_gdrive_ready() and gdrive_support == True:
gdrivefolders=gdriveutils.listRootFolders() gdrivefolders=gdriveutils.listRootFolders()
else: else:
gdrivefolders=None gdrivefolders=None

@ -112,12 +112,15 @@ class email(smtplib.SMTP):
self.transferSize = len(strg) self.transferSize = len(strg)
lock.release() lock.release()
for i in range(0, self.transferSize, chunksize): for i in range(0, self.transferSize, chunksize):
self.sock.send(strg[i:i+chunksize]) if type(strg) == bytes:
self.sock.send((strg[i:i+chunksize]))
else:
self.sock.send((strg[i:i + chunksize]).encode('utf-8'))
lock.acquire() lock.acquire()
self.progress = i self.progress = i
lock.release() lock.release()
else: else:
self.sock.sendall(strg) self.sock.sendall(strg.encode('utf-8'))
except socket.error: except socket.error:
self.close() self.close()
raise smtplib.SMTPServerDisconnected('Server not connected') raise smtplib.SMTPServerDisconnected('Server not connected')

Loading…
Cancel
Save