changes for #77

Code cosmetics
#75:
- More debug infos for kindlegen and sending e-mail.
- Button for sending test e-mail.
- timeout of 5min for sending e-mail

cps/epub.py

@@ -3,8 +3,9 @@ from lxml import etree
 import os
 import uploader
 
+
 def extractCover(zip, coverFile, tmp_file_name):
-    if (coverFile is None):
+    if coverFile is None:
         return None
     else:
         cf = zip.read("OPS/" + coverFile)
@@ -16,35 +17,34 @@ def extractCover(zip, coverFile, tmp_file_name):
         return tmp_cover_name
 
 
-
 def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
     ns = {
-        'n':'urn:oasis:names:tc:opendocument:xmlns:container',
-        'pkg':'http://www.idpf.org/2007/opf',
-        'dc':'http://purl.org/dc/elements/1.1/'
+        'n': 'urn:oasis:names:tc:opendocument:xmlns:container',
+        'pkg': 'http://www.idpf.org/2007/opf',
+        'dc': 'http://purl.org/dc/elements/1.1/'
     }
 
     zip = zipfile.ZipFile(tmp_file_path)
 
     txt = zip.read('META-INF/container.xml')
     tree = etree.fromstring(txt)
-    cfname = tree.xpath('n:rootfiles/n:rootfile/@full-path',namespaces=ns)[0]
+    cfname = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
 
     cf = zip.read(cfname)
     tree = etree.fromstring(cf)
 
-    p = tree.xpath('/pkg:package/pkg:metadata',namespaces=ns)[0]
+    p = tree.xpath('/pkg:package/pkg:metadata', namespaces=ns)[0]
 
     epub_metadata = {}
     for s in ['title', 'description', 'creator']:
-        tmp = p.xpath('dc:%s/text()'%(s),namespaces=ns)
-        if (len(tmp) > 0):
-            epub_metadata[s] = p.xpath('dc:%s/text()'%(s),namespaces=ns)[0]
+        tmp = p.xpath('dc:%s/text()' % s, namespaces=ns)
+        if len(tmp) > 0:
+            epub_metadata[s] = p.xpath('dc:%s/text()' % s, namespaces=ns)[0]
         else:
             epub_metadata[s] = "Unknown"
 
-    coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover']/@href",namespaces=ns)
-    if (len(coversection) > 0):
+    coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover']/@href", namespaces=ns)
+    if len(coversection) > 0:
         coverfile = extractCover(zip, coversection[0], tmp_file_path)
     else:
         coverfile = None
@@ -53,15 +53,13 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
     else:
         title = epub_metadata['title']
 
-
     return uploader.BookMeta(
-        file_path = tmp_file_path,
-        extension = original_file_extension,
-        title = title,
-        author = epub_metadata['creator'],
-        cover = coverfile,
-        description = epub_metadata['description'],
-        tags = "",
-        series = "",
+        file_path=tmp_file_path,
+        extension=original_file_extension,
+        title=title,
+        author=epub_metadata['creator'],
+        cover=coverfile,
+        description=epub_metadata['description'],
+        tags="",
+        series="",
         series_id="")
-