Initial support for Python 3.5+ // Resolve #895 Resolve #1365

This commit is contained in:
Ivan Kravets
2018-12-26 20:54:29 +02:00
parent fabaadec60
commit a60c57ac58
35 changed files with 265 additions and 198 deletions

View File

@@ -45,14 +45,16 @@ class FileDownloader(object):
if disposition and "filename=" in disposition:
self._fname = disposition[disposition.index("filename=") +
9:].replace('"', "").replace("'", "")
self._fname = self._fname.encode("utf8")
if util.PY2:
self._fname = self._fname.encode("utf8")
else:
self._fname = [p for p in url.split("/") if p][-1]
self._destination = self._fname
if dest_dir:
self.set_destination(
join(dest_dir.decode(getfilesystemencoding()), self._fname))
if util.PY2:
dest_dir = dest_dir.decode(getfilesystemencoding())
self.set_destination(join(dest_dir, self._fname))
def set_destination(self, destination):
self._destination = destination