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

py3: More list(filter()) ports

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-10 15:36:10 +05:30
parent dce8ea7719
commit a3c2f867f1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/metadata/xmp.py
View File

@ -126,7 +126,7 @@ def multiple_sequences(expr, root):
ans = [] ans = []
for item in XPath(expr)(root): for item in XPath(expr)(root):
ans += list(read_sequence(item)) ans += list(read_sequence(item))
return filter(None, uniq(ans)) return list(filter(None, uniq(ans)))
def first_alt(expr, root): def first_alt(expr, root):
@ -300,7 +300,7 @@ def metadata_from_xmp_packet(raw_bytes):
languages = multiple_sequences('//dc:language', root) languages = multiple_sequences('//dc:language', root)
if languages: if languages:
languages = filter(None, map(canonicalize_lang, languages)) languages = list(filter(None, map(canonicalize_lang, languages)))
if languages: if languages:
mi.languages = languages mi.languages = languages
@ -486,7 +486,7 @@ def metadata_to_xmp_packet(mi):
if not mi.is_null('pubdate'): if not mi.is_null('pubdate'):
create_sequence_property(dc, 'dc:date', [isoformat(mi.pubdate, as_utc=False)]) # Adobe spec recommends local time create_sequence_property(dc, 'dc:date', [isoformat(mi.pubdate, as_utc=False)]) # Adobe spec recommends local time
if not mi.is_null('languages'): if not mi.is_null('languages'):
langs = filter(None, map(lambda x:lang_as_iso639_1(x) or canonicalize_lang(x), mi.languages)) langs = list(filter(None, map(lambda x:lang_as_iso639_1(x) or canonicalize_lang(x), mi.languages)))
if langs: if langs:
create_sequence_property(dc, 'dc:language', langs, ordered=False) create_sequence_property(dc, 'dc:language', langs, ordered=False)