Merge branch 'Develop'

# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt

cps/comic.py

@@ -17,19 +17,21 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import division, print_function, unicode_literals
 import os
-import uploader
-import logging
-from iso639 import languages as isoLanguages
+
+from . import logger, isoLanguages
+from .constants import BookMeta
 
 
-logger = logging.getLogger("book_formats")
+log = logger.create()
+
 
 try:
     from comicapi.comicarchive import ComicArchive, MetaDataStyle
     use_comic_meta = True
 except ImportError as e:
-    logger.warning('cannot import comicapi, extracting comic metadata will not work: %s', e)
+    log.warning('cannot import comicapi, extracting comic metadata will not work: %s', e)
     import zipfile
     import tarfile
     use_comic_meta = False
@@ -96,7 +98,7 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension):
         else:
              loadedMetadata.language = ""
 
-        return uploader.BookMeta(
+        return BookMeta(
                 file_path=tmp_file_path,
                 extension=original_file_extension,
                 title=loadedMetadata.title or original_file_name,
@@ -109,7 +111,7 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension):
                 languages=loadedMetadata.language)
     else:
 
-        return uploader.BookMeta(
+        return BookMeta(
             file_path=tmp_file_path,
             extension=original_file_extension,
             title=original_file_name,