Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2010-09-26 18:54:29 +01:00
commit b3014af31f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,7 +363,7 @@ class Metadata(object):
if len(other_cover) > len(self_cover): if len(other_cover) > len(self_cover):
self.cover_data = other.cover_data self.cover_data = other.cover_data
if getattr(other, 'custom_field_keys', None): if callable(getattr(other, 'custom_field_keys', None)):
for x in other.custom_field_keys(): for x in other.custom_field_keys():
meta = other.get_user_metadata(x, make_copy=True) meta = other.get_user_metadata(x, make_copy=True)
if meta is not None: if meta is not None: