Merge remote-tracking branch 'upstream/master' into tasks

# Conflicts: # cps/helper.py
2020-08-23 21:38:56 -04:00
parent ac22483f98 843279bacb
commit 6a8ae9c0c4
12 changed files with 404 additions and 304 deletions
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@ -377,7 +377,8 @@ def edit_book_publisher(to_save, book):
    if to_save["publisher"]:
        publisher = to_save["publisher"].rstrip().strip()
        if len(book.publishers) == 0 or (len(book.publishers) > 0 and publisher != book.publishers[0].name):
-            changed |= modify_database_object([publisher], book.publishers, db.Publishers, calibre_db.session, 'publisher')
+            changed |= modify_database_object([publisher], book.publishers, db.Publishers, calibre_db.session,
+                                              'publisher')
    elif len(book.publishers):
        changed |= modify_database_object([], book.publishers, db.Publishers, calibre_db.session, 'publisher')
    return changed