Merge remote-tracking branch 'github/config_sql' into Develop

2019-07-09 19:29:58 +02:00
parent 499a66dfb0 006e596c72
commit e734bb120a
30 changed files with 2469 additions and 6660 deletions
@@ -340,6 +340,8 @@ class WorkerThread(threading.Thread):
        check = p.returncode
        calibre_traceback = p.stderr.readlines()
        for ele in calibre_traceback:
+            if sys.version_info < (3, 0):
+                ele = ele.decode('utf-8')
            log.debug(ele.strip('\n'))
            if not ele.startswith('Traceback') and not ele.startswith('  File'):
                error_message = "Calibre failed with error: %s" % ele.strip('\n')