wrong conflict merge

pull/152/head^2^2
林檎 8 years ago
parent 5bd34ba6a9
commit 376eb8752e

@ -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

Loading…
Cancel
Save