summaryrefslogtreecommitdiffstats
path: root/pyload/network
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-05-12 22:25:39 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-05-12 22:25:39 +0200
commit971754eba93701cfb22bc4399a37debf238eddf1 (patch)
treee3a36023f93b73a1621de0c6c9503ccbb301fb03 /pyload/network
parentFix dict generators for python 2.5 (diff)
downloadpyload-971754eba93701cfb22bc4399a37debf238eddf1.tar.xz
General fixup (1)
Diffstat (limited to 'pyload/network')
-rw-r--r--pyload/network/HTTPChunk.py4
-rw-r--r--pyload/network/HTTPDownload.py2
-rw-r--r--pyload/network/JsEngine.py6
-rw-r--r--pyload/network/XDCCRequest.py2
4 files changed, 7 insertions, 7 deletions
diff --git a/pyload/network/HTTPChunk.py b/pyload/network/HTTPChunk.py
index 1ce72a918..5252afb06 100644
--- a/pyload/network/HTTPChunk.py
+++ b/pyload/network/HTTPChunk.py
@@ -101,7 +101,7 @@ class ChunkInfo(object):
return ci
- def os.remove(self):
+ def remove(self):
fs_name = fs_encode("%s.chunks" % self.name)
if os.path.exists(fs_name): os.remove(fs_name)
@@ -305,7 +305,7 @@ class HTTPChunk(HTTPRequest):
self.fp.close() #: needs to be closed, or merging chunks will fail
- def os.close(self):
+ def 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 e5917aa1f..8b124512b 100644
--- a/pyload/network/HTTPDownload.py
+++ b/pyload/network/HTTPDownload.py
@@ -304,7 +304,7 @@ class HTTPDownload(object):
chunk.close()
- def os.close(self):
+ def close(self):
""" cleanup """
for chunk in self.chunks:
self.closeChunk(chunk)
diff --git a/pyload/network/JsEngine.py b/pyload/network/JsEngine.py
index 8b5e2d760..9c8de05a7 100644
--- a/pyload/network/JsEngine.py
+++ b/pyload/network/JsEngine.py
@@ -213,10 +213,10 @@ class RhinoEngine(AbstractEngine):
jspath = [
"/usr/share/java/js.jar",
"js.jar",
- path.join(pypath, "js.jar")
+ os.path.join(pypath, "js.jar")
]
for p in jspath:
- if path.exists(p):
+ if os.path.exists(p):
self.path = p
break
else:
@@ -240,7 +240,7 @@ class JscEngine(AbstractEngine):
def setup(self):
jspath = "/System/Library/Frameworks/JavaScriptCore.framework/Resources/jsc"
- self.path = jspath if path.exists(jspath) else ""
+ self.path = jspath if os.path.exists(jspath) else ""
def eval(self, script):
diff --git a/pyload/network/XDCCRequest.py b/pyload/network/XDCCRequest.py
index 470ab96a7..b71594915 100644
--- a/pyload/network/XDCCRequest.py
+++ b/pyload/network/XDCCRequest.py
@@ -143,5 +143,5 @@ class XDCCRequest(object):
return (self.recv * 100) / self.filesize if elf.filesize else 0
- def os.close(self):
+ def close(self):
pass