diff options
Diffstat (limited to 'pyload/network')
| -rw-r--r-- | pyload/network/HTTPChunk.py | 25 | ||||
| -rw-r--r-- | pyload/network/HTTPDownload.py | 8 | ||||
| -rw-r--r-- | pyload/network/JsEngine.py | 2 | ||||
| -rw-r--r-- | pyload/network/XDCCRequest.py | 11 |
4 files changed, 22 insertions, 24 deletions
diff --git a/pyload/network/HTTPChunk.py b/pyload/network/HTTPChunk.py index 85c20d519..a48c69cba 100644 --- a/pyload/network/HTTPChunk.py +++ b/pyload/network/HTTPChunk.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- # @author: RaNaN -from os import remove, stat, fsync -from os.path import exists -from time import sleep -from re import search -from pyload.utils import fs_encode import codecs -import pycurl +import os import urllib +import pycurl + +from time import sleep +from re import search + from pyload.network.HTTPRequest import HTTPRequest +from pyload.utils import fs_encode class WrongFormat(Exception): @@ -71,7 +72,7 @@ class ChunkInfo(object): @staticmethod def load(name): fs_name = fs_encode("%s.chunks" % name) - if not exists(fs_name): + if not os.path.exists(fs_name): raise IOError() fh = codecs.open(fs_name, "r", "utf_8") name = fh.readline()[:-1] @@ -101,9 +102,9 @@ class ChunkInfo(object): return ci - def remove(self): + def os.remove(self): fs_name = fs_encode("%s.chunks" % self.name) - if exists(fs_name): remove(fs_name) + if os.path.exists(fs_name): os.remove(fs_name) def getCount(self): @@ -172,7 +173,7 @@ class HTTPChunk(HTTPRequest): self.fp = open(fs_name, "ab") self.arrived = self.fp.tell() if not self.arrived: - self.arrived = stat(fs_name).st_size + self.arrived = os.stat(fs_name).st_size if self.range: # do nothing if chunk already finished @@ -301,11 +302,11 @@ class HTTPChunk(HTTPRequest): def flushFile(self): """ flush and close file """ self.fp.flush() - fsync(self.fp.fileno()) #: make sure everything was written to disk + os.fsync(self.fp.fileno()) #: make sure everything was written to disk self.fp.close() #: needs to be closed, or merging chunks will fail - def close(self): + def os.close(self): """ closes everything, unusable after this """ if self.fp: self.fp.close() self.c.close() diff --git a/pyload/network/HTTPDownload.py b/pyload/network/HTTPDownload.py index 62cef457b..78e069f7e 100644 --- a/pyload/network/HTTPDownload.py +++ b/pyload/network/HTTPDownload.py @@ -3,18 +3,16 @@ from __future__ import with_statement +import os import shutil import pycurl -from os import remove, fsync -from os.path import dirname from time import sleep, time from logging import getLogger from pyload.network.HTTPChunk import ChunkInfo, HTTPChunk from pyload.network.HTTPRequest import BadHeader - from pyload.plugin.Plugin import Abort from pyload.utils import fs_join, fs_encode @@ -101,7 +99,7 @@ class HTTPDownload(object): reshutil.move(fname) #: remove chunk if self.nameDisposition and self.disposition: - self.filename = fs_join(dirname(self.filename), self.nameDisposition) + self.filename = fs_join(os.path.dirname(self.filename), self.nameDisposition) shutil.move(init, fs_encode(self.filename)) self.info.remove() #: remove info file @@ -307,7 +305,7 @@ class HTTPDownload(object): chunk.close() - def close(self): + def os.close(self): """ cleanup """ for chunk in self.chunks: self.closeChunk(chunk) diff --git a/pyload/network/JsEngine.py b/pyload/network/JsEngine.py index b59d07dc4..c542b4dac 100644 --- a/pyload/network/JsEngine.py +++ b/pyload/network/JsEngine.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- # @author: vuolter +import os import subprocess import sys -from os import path from urllib import quote from pyload.utils import encode, decode, uniqify diff --git a/pyload/network/XDCCRequest.py b/pyload/network/XDCCRequest.py index 24146ccaa..b9e9958aa 100644 --- a/pyload/network/XDCCRequest.py +++ b/pyload/network/XDCCRequest.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- # @author: jeix +import os import socket import struct -from os import remove -from os.path import exists from select import select from time import time @@ -57,14 +56,14 @@ class XDCCRequest(object): dccsock.settimeout(self.timeout) dccsock.connect((ip, port)) - if exists(filename): + if os.path.exists(filename): i = 0 nameParts = filename.rpartition(".") while True: newfilename = "%s-%d%s%s" % (nameParts[0], i, nameParts[1], nameParts[2]) i += 1 - if not exists(newfilename): + if not os.path.exists(newfilename): filename = newfilename break @@ -75,7 +74,7 @@ class XDCCRequest(object): if self.abort: dccsock.close() fh.close() - remove(filename) + os.remove(filename) raise Abort self._keepAlive(irc, ircbuffer) @@ -145,5 +144,5 @@ class XDCCRequest(object): return (self.recv * 100) / self.filesize if elf.filesize else 0 - def close(self): + def os.close(self): pass |