Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fis reset tweaks in test not applying to field_metadata in Metadata objects

Browse Source
This commit is contained in:
Kovid Goyal 2013-08-25 12:53:56 +05:30
parent 172e4def71
commit ec1c6d43cf
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/db/tests/base.py
View File

@ -24,8 +24,6 @@ class BaseTest(unittest.TestCase):
def setUp(self): def setUp(self):
from calibre.utils.recycle_bin import nuke_recycle from calibre.utils.recycle_bin import nuke_recycle
nuke_recycle() nuke_recycle()
from calibre.utils.config_base import reset_tweaks_to_default
reset_tweaks_to_default()
self.library_path = self.mkdtemp() self.library_path = self.mkdtemp()
self.create_db(self.library_path) self.create_db(self.library_path)

4
src/calibre/db/tests/main.py
View File

@ -18,6 +18,10 @@ def find_tests():
return unittest.defaultTestLoader.discover(os.path.dirname(os.path.abspath(__file__)), pattern='*.py') return unittest.defaultTestLoader.discover(os.path.dirname(os.path.abspath(__file__)), pattern='*.py')
if __name__ == '__main__': if __name__ == '__main__':
from calibre.utils.config_base import reset_tweaks_to_default
from calibre.ebooks.metadata.book.base import reset_field_metadata
reset_tweaks_to_default()
reset_field_metadata()
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('name', nargs='?', default=None, parser.add_argument('name', nargs='?', default=None,
help='The name of the test to run, for e.g. writing.WritingTest.many_many_basic or .many_many_basic for a shortcut') help='The name of the test to run, for e.g. writing.WritingTest.many_many_basic or .many_many_basic for a shortcut')

4
src/calibre/ebooks/metadata/book/base.py
View File

@ -42,6 +42,10 @@ NULL_VALUES = {
field_metadata = FieldMetadata() field_metadata = FieldMetadata()
def reset_field_metadata():
global field_metadata
field_metadata = FieldMetadata()
ck = lambda typ: icu_lower(typ).strip().replace(':', '').replace(',', '') ck = lambda typ: icu_lower(typ).strip().replace(':', '').replace(',', '')
cv = lambda val: val.strip().replace(',', '|').replace(':', '|') cv = lambda val: val.strip().replace(',', '|').replace(':', '|')