Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'

# Conflicts: # cps/db.py # cps/web.py # requirements.txt
2017-03-07 20:22:28 +01:00
parent 6feb1f8894 fc10f55bd4
commit 80f1276624
9 changed files with 78 additions and 49 deletions
@@ -289,10 +289,11 @@ def setup_db():
        return False

    dbpath = os.path.join(config.config_calibre_dir, "metadata.db")
-    engine = create_engine('sqlite:///{0}'.format(dbpath.encode('utf-8')), echo=False, isolation_level="SERIALIZABLE")
+    #engine = create_engine('sqlite:///{0}'.format(dbpath.encode('utf-8')), echo=False, isolation_level="SERIALIZABLE")
+    engine = create_engine('sqlite:///'+ dbpath, echo=False, isolation_level="SERIALIZABLE")
    try:
        conn = engine.connect()
-    except:
+    except Exception as e:
        content = ub.session.query(ub.Settings).first()
        content.config_calibre_dir = None
        content.db_configured = False