Fix for #575
Fix no pydrive dependency installed Fix sending email on python3
This commit is contained in:
parent
fac0921acf
commit
c38f331b6f
|
@ -34,7 +34,7 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for library,version in versions.iteritems() %}
|
||||
{% for library,version in versions.items() %}
|
||||
<tr>
|
||||
<th>{{library}}</th>
|
||||
<td>{{version}}</td>
|
||||
|
|
|
@ -2785,7 +2785,7 @@ def configuration_helper(origin):
|
|||
app.logger.info('Reboot required, restarting')
|
||||
if origin:
|
||||
success = True
|
||||
if is_gdrive_ready():
|
||||
if is_gdrive_ready() and gdrive_support == True:
|
||||
gdrivefolders=gdriveutils.listRootFolders()
|
||||
else:
|
||||
gdrivefolders=None
|
||||
|
|
|
@ -112,12 +112,15 @@ class email(smtplib.SMTP):
|
|||
self.transferSize = len(strg)
|
||||
lock.release()
|
||||
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()
|
||||
self.progress = i
|
||||
lock.release()
|
||||
else:
|
||||
self.sock.sendall(strg)
|
||||
self.sock.sendall(strg.encode('utf-8'))
|
||||
except socket.error:
|
||||
self.close()
|
||||
raise smtplib.SMTPServerDisconnected('Server not connected')
|
||||
|
|
Loading…
Reference in New Issue
Block a user