NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrong conflict merge

Browse Source
This commit is contained in:
林檎 2017-03-06 14:46:44 +08:00
parent 5bd34ba6a9
commit 376eb8752e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cps/epub.py
View File

@ -71,8 +71,6 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
epub_metadata['language'] = isoLanguages.get(part3=lang).name epub_metadata['language'] = isoLanguages.get(part3=lang).name
else: else:
epub_metadata['language'] = "" epub_metadata['language'] = ""
except IndexError as e:
epub_metadata['language'] = ""
coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns) coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
coverfile = None coverfile = None