From 7af7030d983deeee9d99a1ae36bed4d1c7b981e7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 4 May 2013 08:53:57 +0530 Subject: [PATCH] Fix regression that broke deepcopying of Metadata() objects --- src/calibre/ebooks/metadata/book/formatter.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/formatter.py b/src/calibre/ebooks/metadata/book/formatter.py index 4ddd3d68df..7adbe81016 100644 --- a/src/calibre/ebooks/metadata/book/formatter.py +++ b/src/calibre/ebooks/metadata/book/formatter.py @@ -14,16 +14,15 @@ class SafeFormat(TemplateFormatter): def __init__(self): TemplateFormatter.__init__(self) - from calibre.ebooks.metadata.book.base import field_metadata - self.field_metadata = field_metadata def get_value(self, orig_key, args, kwargs): if not orig_key: return '' key = orig_key = orig_key.lower() - if key != 'title_sort' and key not in TOP_LEVEL_IDENTIFIERS and \ - key not in ALL_METADATA_FIELDS: - key = self.field_metadata.search_term_to_field_key(key) + if (key != 'title_sort' and key not in TOP_LEVEL_IDENTIFIERS and + key not in ALL_METADATA_FIELDS): + from calibre.ebooks.metadata.book.base import field_metadata + key = field_metadata.search_term_to_field_key(key) if key is None or (self.book and key not in self.book.all_field_keys()): if hasattr(self.book, orig_key):