From 784093796e9f68ac006d887e14ff29f7a3bc7e34 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 22 Feb 2013 09:52:33 +0530 Subject: [PATCH] ... --- src/calibre/db/tests/writing.py | 2 +- src/calibre/db/write.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py index 4ac1eb7d8d..7b7e815587 100644 --- a/src/calibre/db/tests/writing.py +++ b/src/calibre/db/tests/writing.py @@ -73,7 +73,7 @@ class WritingTest(BaseTest): for name, getter, setter in ( ('pubdate', 'pubdate', 'set_pubdate'), ('timestamp', 'timestamp', 'set_timestamp'), - ('#date', None, None) + ('#date', None, None), ): tests.append(self.create_test( name, ('2011-1-12', UNDEFINED_DATE, None), getter, setter)) diff --git a/src/calibre/db/write.py b/src/calibre/db/write.py index 78bd31a967..8b0f96107a 100644 --- a/src/calibre/db/write.py +++ b/src/calibre/db/write.py @@ -144,7 +144,7 @@ class Writer(object): self.name = field.name self.field = field dt = field.metadata['datatype'] - self.filter_vals = lambda x: x + self.accept_vals = lambda x: True if dt == 'composite' or field.name in {'cover', 'size', 'path'}: self.set_books_func = dummy elif field.is_many: @@ -154,11 +154,11 @@ class Writer(object): self.set_books_func = (one_one_in_books if field.metadata['table'] == 'books' else one_one_in_other) if self.name in {'timestamp', 'uuid'}: - self.filter_vals = bool + self.accept_vals = bool def set_books(self, book_id_val_map, db): book_id_val_map = {k:self.adapter(v) for k, v in - book_id_val_map.iteritems() if self.filter_vals(v)} + book_id_val_map.iteritems() if self.accept_vals(v)} if not book_id_val_map: return set() dirtied = self.set_books_func(book_id_val_map, db, self.field)