Merge branch 'master' into Develop

cps/uploader.py

@@ -233,7 +233,10 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
         if subject == '':
             subject = doc_info.subject
         if tags == '' and '/Keywords' in doc_info:
-            tags = doc_info['/Keywords']
+            if isinstance(doc_info['/Keywords'], bytes):
+                tags = doc_info['/Keywords'].decode('utf-8')
+            else:
+                tags = doc_info['/Keywords']
     else:
         title = original_file_name
 

optional-requirements.txt

@@ -38,7 +38,7 @@ beautifulsoup4>=4.0.1,<4.2.0
 cchardet>=2.0.0,<2.2.0
 
 # Comics
-natsort>=2.2.0,<8.1.0
+natsort>=2.2.0,<8.2.0
 comicapi>=2.2.0,<2.3.0
 
 # Kobo integration

setup.cfg

@@ -92,7 +92,7 @@ metadata =
 	beautifulsoup4>=4.0.1,<4.2.0
 	cchardet>=2.0.0,<2.2.0
 comics = 
-	natsort>=2.2.0,<8.1.0
+	natsort>=2.2.0,<8.2.0
 	comicapi>=2.2.0,<2.3.0
 kobo = 
 	jsonschema>=3.2.0,<4.5.0