From c38f331b6f89b8f1820fee8d33bf18409f855658 Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <ozzie.fernandez.isaacs@gmail.com>
Date: Mon, 13 Aug 2018 19:43:50 +0200
Subject: [PATCH] Fix for #575 Fix no pydrive dependency installed Fix sending
 email on python3

---
 cps/templates/stats.html | 2 +-
 cps/web.py               | 2 +-
 cps/worker.py            | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cps/templates/stats.html b/cps/templates/stats.html
index dc5fe865..a99f13b0 100644
--- a/cps/templates/stats.html
+++ b/cps/templates/stats.html
@@ -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>
diff --git a/cps/web.py b/cps/web.py
index 1695ff31..b942f9c8 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -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
diff --git a/cps/worker.py b/cps/worker.py
index 39a7cb56..bc2e1d12 100644
--- a/cps/worker.py
+++ b/cps/worker.py
@@ -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')