From 376eb8752ec7a051808c58e3a27fbe6e201b3c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= <apple@apples-MacBook-Pro.local>
Date: Mon, 6 Mar 2017 14:46:44 +0800
Subject: [PATCH] wrong conflict merge

---
 cps/epub.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cps/epub.py b/cps/epub.py
index 563faa1c..455b1ab8 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -71,9 +71,7 @@ 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
     if len(coversection) > 0: