From a05448f7844d9f6f0730a4354b6c6e70dc8020ed Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sun, 26 Sep 2010 17:49:52 +0100
Subject: [PATCH] Fix stupid mistake in method naming in base.py

---
 src/calibre/ebooks/metadata/book/base.py | 21 +++++++--------------
 src/calibre/gui2/library/models.py       |  2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py
index 0526de96a0..bdf11ad4ba 100644
--- a/src/calibre/ebooks/metadata/book/base.py
+++ b/src/calibre/ebooks/metadata/book/base.py
@@ -181,17 +181,10 @@ class Metadata(object):
         '''
         return metadata describing a standard or custom field.
         '''
-        if key in self.user_metadata_keys():
+        if key not in self.custom_field_keys():
             return self.get_standard_metadata(self, key, make_copy=False)
         return self.get_user_metadata(key, make_copy=False)
 
-    def user_metadata_keys(self):
-        '''
-        Return the standard keys actually in this book.
-        '''
-        _data = object.__getattribute__(self, '_data')
-        return frozenset(_data['user_metadata'].iterkeys())
-
     def all_non_none_fields(self):
         '''
         Return a dictionary containing all non-None metadata fields, including
@@ -305,7 +298,7 @@ class Metadata(object):
     def print_all_attributes(self):
         for x in STANDARD_METADATA_FIELDS:
             prints('%s:'%x, getattr(self, x, 'None'))
-        for x in self.user_metadata_keys():
+        for x in self.custom_field_keys():
             meta = self.get_user_metadata(x, make_copy=False)
             if meta is not None:
                 prints(x, meta)
@@ -370,8 +363,8 @@ class Metadata(object):
                 if len(other_cover) > len(self_cover):
                     self.cover_data = other.cover_data
 
-            if getattr(other, 'user_metadata_keys', None):
-                for x in other.user_metadata_keys():
+            if getattr(other, 'custom_field_keys', None):
+                for x in other.custom_field_keys():
                     meta = other.get_user_metadata(x, make_copy=True)
                     if meta is not None:
                         self_tags = self.get(x, [])
@@ -434,7 +427,7 @@ class Metadata(object):
         '''
         returns the tuple (field_name, formatted_value)
         '''
-        if key in self.user_metadata_keys():
+        if key in self.custom_field_keys():
             res = self.get(key, None)
             cmeta = self.get_user_metadata(key, make_copy=False)
             name = unicode(cmeta['name'])
@@ -516,7 +509,7 @@ class Metadata(object):
             fmt('Published', isoformat(self.pubdate))
         if self.rights is not None:
             fmt('Rights', unicode(self.rights))
-        for key in self.user_metadata_keys():
+        for key in self.custom_field_keys():
             val = self.get(key, None)
             if val:
                 (name, val) = self.format_field(key)
@@ -541,7 +534,7 @@ class Metadata(object):
             ans += [(_('Published'), unicode(self.pubdate.isoformat(' ')))]
         if self.rights is not None:
             ans += [(_('Rights'), unicode(self.rights))]
-        for key in self.user_metadata_keys():
+        for key in self.custom_field_keys():
             val = self.get(key, None)
             if val:
                 (name, val) = self.format_field(key)
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index ff6d8b70f0..6725989ee5 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -331,7 +331,7 @@ class BooksModel(QAbstractTableModel): # {{{
                 _('Book <font face="serif">%s</font> of %s.')%\
                     (sidx, prepare_string_for_xml(series))
         mi = self.db.get_metadata(idx)
-        for key in mi.user_metadata_keys():
+        for key in mi.custom_field_keys():
             name, val = mi.format_field(key)
             if val:
                 data[name] = val