Merge remote-tracking branch 'github/patch-1' into Develop

Oauth is optional again
2019-02-24 19:34:57 +01:00
parent 1de3929988 38307ececb
commit eef4787b79
7 changed files with 13 additions and 13 deletions
@@ -36,7 +36,11 @@ from cps.shelf import shelf
 from cps.admin import admi
 from cps.gdrive import gdrive
 from cps.editbooks import editbook
-from cps.oauth_bb import oauth
+try:
+    from cps.oauth_bb import oauth
+    oauth_available = True
+except ImportError:
+    oauth_available = False


 if __name__ == '__main__':
@@ -49,7 +53,8 @@ if __name__ == '__main__':
    app.register_blueprint(admi)
    app.register_blueprint(gdrive)
    app.register_blueprint(editbook)
-    app.register_blueprint(oauth)
+    if oauth_available:
+        app.register_blueprint(oauth)
    Server.startServer()