Merge branch 'master' into Develop

# Conflicts: # cps/__init__.py # cps/comic.py # cps/editbooks.py # cps/helper.py # cps/kobo.py # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/uploader.py # cps/web.py
2020-04-30 18:08:28 +02:00
parent 27eb09fb19 e3246fd751
commit b160a8de0b
27 changed files with 589 additions and 495 deletions
@@ -418,7 +418,7 @@ def dispose():
        except: pass
        if old_session.bind:
            try: old_session.bind.dispose()
-            except: pass
+            except Exception: pass

    for attr in list(Books.__dict__.keys()):
        if attr.startswith("custom_column_"):