wrong conflict merge

8 years ago · 376eb8752e
parent 5bd34ba6a9
commit 376eb8752e
1 changed files with 1 additions and 3 deletions
--- a/cps/epub.py
+++ b/cps/epub.py
@ -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
        else:
            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)
    coverfile = None