Fix Download Bug.

cps/web.py

@@ -40,7 +40,6 @@ from functools import wraps
 import base64
 from sqlalchemy.sql import *
 import json
-import urllib
 import datetime
 from iso639 import languages as isoLanguages
 from iso639 import __version__ as iso639Version
@@ -836,7 +835,7 @@ def get_opds_download_link(book_id, format):
     else:
         # file_name = helper.get_valid_filename(file_name)
         response = make_response(send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + format))
-    response.headers=headers
+    response.headers["Content-Disposition"] = "attachment; filename*=UTF-8''%s.%s" % (quote(file_name.encode('utf8')), format)
     return response
 
 
@@ -1645,13 +1644,13 @@ def get_download_link(book_id, format):
             headers["Content-Type"] = mimetypes.types_map['.' + format]
         except:
             pass
-        headers["Content-Disposition"] = "attachment; filename*=UTF-8''%s.%s" % (urllib.quote(file_name.encode('utf-8')), format)
+        headers["Content-Disposition"] = "attachment; filename*=UTF-8''%s.%s" % (quote(file_name.encode('utf-8')), format)
         if config.config_use_google_drive:
             df=gdriveutils.getFileFromEbooksFolder(Gdrive.Instance().drive, book.path, '%s.%s' % (data.name, format))
             return do_gdrive_download(df, headers)
         else:
             response = make_response(send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + format))
-        response.headers=headers
+        response.headers["Content-Disposition"] = "attachment; filename*=UTF-8''%s.%s" % (quote(file_name.encode('utf-8')), format)
         return response
     else:
         abort(404)