diff options
author | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-05-01 18:11:25 +0200 |
---|---|---|
committer | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-05-01 18:11:25 +0200 |
commit | c126f738bd5be581d5321521eedc9b14a8165a0e (patch) | |
tree | 418989bfa81bfd30085f09102df53f6f58b00f14 /pyload/network/HTTPDownload.py | |
parent | Use 'import' instead 'from' (1) (diff) | |
download | pyload-c126f738bd5be581d5321521eedc9b14a8165a0e.tar.xz |
Use 'import' instead 'from' (2)
Diffstat (limited to 'pyload/network/HTTPDownload.py')
-rw-r--r-- | pyload/network/HTTPDownload.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pyload/network/HTTPDownload.py b/pyload/network/HTTPDownload.py index 1e74d4476..2276af609 100644 --- a/pyload/network/HTTPDownload.py +++ b/pyload/network/HTTPDownload.py @@ -3,12 +3,13 @@ from __future__ import with_statement +import shutil + import pycurl from os import remove, fsync from os.path import dirname from time import sleep, time -from shutil import move from logging import getLogger from pyload.network.HTTPChunk import ChunkInfo, HTTPChunk @@ -94,16 +95,16 @@ class HTTPDownload(object): break fo.write(data) if fo.tell() < self.info.getChunkRange(i)[1]: - remove(init) - self.info.remove() #: there are probably invalid chunks + reshutil.move(init) + self.info.reshutil.move() #: there are probably invalid chunks raise Exception("Downloaded content was smaller than expected. Try to reduce download connections.") - remove(fname) #: remove chunk + reshutil.move(fname) #: remove chunk if self.nameDisposition and self.disposition: self.filename = fs_join(dirname(self.filename), self.nameDisposition) - move(init, fs_encode(self.filename)) - self.info.remove() #: remove info file + shutil.move(init, fs_encode(self.filename)) + self.info.reshutil.move() #: remove info file def download(self, chunks=1, resume=False): @@ -238,8 +239,8 @@ class HTTPDownload(object): to_clean = filter(lambda x: x is not init, self.chunks) for chunk in to_clean: self.closeChunk(chunk) - self.chunks.remove(chunk) - remove(fs_encode(self.info.getChunkName(chunk.id))) + self.chunks.reshutil.move(chunk) + reshutil.move(fs_encode(self.info.getChunkName(chunk.id))) # let first chunk load the rest and update the info file init.resetRange() |