From ec1c6d43cfe2a17b515ed290d019d6d265eec8c6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Aug 2013 12:53:56 +0530
Subject: [PATCH] Fis reset tweaks in test not applying to field_metadata in
 Metadata objects

---
 src/calibre/db/tests/base.py             | 2 --
 src/calibre/db/tests/main.py             | 4 ++++
 src/calibre/ebooks/metadata/book/base.py | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/calibre/db/tests/base.py b/src/calibre/db/tests/base.py
index 82f5360585..fae9ae944f 100644
--- a/src/calibre/db/tests/base.py
+++ b/src/calibre/db/tests/base.py
@@ -24,8 +24,6 @@ class BaseTest(unittest.TestCase):
     def setUp(self):
         from calibre.utils.recycle_bin import nuke_recycle
         nuke_recycle()
-        from calibre.utils.config_base import reset_tweaks_to_default
-        reset_tweaks_to_default()
         self.library_path = self.mkdtemp()
         self.create_db(self.library_path)
 
diff --git a/src/calibre/db/tests/main.py b/src/calibre/db/tests/main.py
index 461edc95bb..822a12f4e2 100644
--- a/src/calibre/db/tests/main.py
+++ b/src/calibre/db/tests/main.py
@@ -18,6 +18,10 @@ def find_tests():
     return unittest.defaultTestLoader.discover(os.path.dirname(os.path.abspath(__file__)), pattern='*.py')
 
 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.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')
diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 046690890c..2f964bc4ee 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -42,6 +42,10 @@ NULL_VALUES = {
 
 field_metadata = FieldMetadata()
 
+def reset_field_metadata():
+    global field_metadata
+    field_metadata = FieldMetadata()
+
 ck = lambda typ: icu_lower(typ).strip().replace(':', '').replace(',', '')
 cv = lambda val: val.strip().replace(',', '|').replace(':', '|')