summaryrefslogtreecommitdiffstats
path: root/pyload/network
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/network')
-rw-r--r--pyload/network/Browser.py7
-rw-r--r--pyload/network/CookieJar.py8
-rw-r--r--pyload/network/HTTPChunk.py4
-rw-r--r--pyload/network/HTTPDownload.py9
-rw-r--r--pyload/network/HTTPRequest.py18
-rw-r--r--pyload/network/RequestFactory.py2
-rw-r--r--pyload/network/XDCCRequest.py7
7 files changed, 32 insertions, 23 deletions
diff --git a/pyload/network/Browser.py b/pyload/network/Browser.py
index fab7454f3..d8617fabc 100644
--- a/pyload/network/Browser.py
+++ b/pyload/network/Browser.py
@@ -68,7 +68,8 @@ class Browser(object):
@property
def percent(self):
- if not self.size: return 0
+ if not self.size:
+ return 0
return (self.arrived * 100) / self.size
@@ -118,12 +119,12 @@ class Browser(object):
:param pwd: string, user:password
"""
- self.options["auth"] = pwd
+ self.options['auth'] = pwd
self.renewHTTPRequest() #: we need a new request
def removeAuth(self):
- if "auth" in self.options: del self.options["auth"]
+ if "auth" in self.options: del self.options['auth']
self.renewHTTPRequest()
diff --git a/pyload/network/CookieJar.py b/pyload/network/CookieJar.py
index 35d7fa6ef..a970a08e5 100644
--- a/pyload/network/CookieJar.py
+++ b/pyload/network/CookieJar.py
@@ -24,8 +24,8 @@ class CookieJar(Cookie.SimpleCookie):
def setCookie(self, domain, name, value, path="/", exp=None, secure="FALSE"):
self[name] = value
- self[name]["domain"] = domain
- self[name]["path"] = path
+ self[name]['domain'] = domain
+ self[name]['path'] = path
# Value of expires should be integer if possible
# otherwise the cookie won't be used
@@ -37,7 +37,7 @@ class CookieJar(Cookie.SimpleCookie):
except ValueError:
expires = exp
- self[name]["expires"] = expires
+ self[name]['expires'] = expires
if secure == "TRUE":
- self[name]["secure"] = secure
+ self[name]['secure'] = secure
diff --git a/pyload/network/HTTPChunk.py b/pyload/network/HTTPChunk.py
index 82e1ca76e..784b64349 100644
--- a/pyload/network/HTTPChunk.py
+++ b/pyload/network/HTTPChunk.py
@@ -12,6 +12,7 @@ import urllib
from pyload.network.HTTPRequest import HTTPRequest
+
class WrongFormat(Exception):
pass
@@ -176,7 +177,8 @@ class HTTPChunk(HTTPRequest):
if self.range:
# do nothing if chunk already finished
- if self.arrived + self.range[0] >= self.range[1]: return None
+ if self.arrived + self.range[0] >= self.range[1]:
+ return None
if self.id == len(self.p.info.chunks) - 1: #: as last chunk dont set end range, so we get everything
range = "%i-" % (self.arrived + self.range[0])
diff --git a/pyload/network/HTTPDownload.py b/pyload/network/HTTPDownload.py
index 32c165f82..13666195a 100644
--- a/pyload/network/HTTPDownload.py
+++ b/pyload/network/HTTPDownload.py
@@ -72,7 +72,8 @@ class HTTPDownload(object):
@property
def percent(self):
- if not self.size: return 0
+ if not self.size:
+ return 0
return (self.arrived * 100) / self.size
@@ -134,7 +135,8 @@ class HTTPDownload(object):
finally:
self.close()
- if self.nameDisposition and self.disposition: return self.nameDisposition
+ if self.nameDisposition and self.disposition:
+ return self.nameDisposition
return None
@@ -295,7 +297,8 @@ class HTTPDownload(object):
def findChunk(self, handle):
""" linear search to find a chunk (should be ok since chunk size is usually low) """
for chunk in self.chunks:
- if chunk.c == handle: return chunk
+ if chunk.c == handle:
+ return chunk
def closeChunk(self, chunk):
diff --git a/pyload/network/HTTPRequest.py b/pyload/network/HTTPRequest.py
index 3e5903df3..62c0ef72b 100644
--- a/pyload/network/HTTPRequest.py
+++ b/pyload/network/HTTPRequest.py
@@ -93,24 +93,24 @@ class HTTPRequest(object):
def setInterface(self, options):
- interface, proxy, ipv6 = options["interface"], options["proxies"], options["ipv6"]
+ interface, proxy, ipv6 = options['interface'], options['proxies'], options['ipv6']
if interface and interface.lower() != "none":
self.c.setopt(pycurl.INTERFACE, str(interface))
if proxy:
- if proxy["type"] == "socks4":
+ if proxy['type'] == "socks4":
self.c.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_SOCKS4)
- elif proxy["type"] == "socks5":
+ elif proxy['type'] == "socks5":
self.c.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_SOCKS5)
else:
self.c.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_HTTP)
- self.c.setopt(pycurl.PROXY, str(proxy["address"]))
- self.c.setopt(pycurl.PROXYPORT, proxy["port"])
+ self.c.setopt(pycurl.PROXY, str(proxy['address']))
+ self.c.setopt(pycurl.PROXYPORT, proxy['port'])
- if proxy["username"]:
- self.c.setopt(pycurl.PROXYUSERPWD, str("%s:%s" % (proxy["username"], proxy["password"])))
+ if proxy['username']:
+ self.c.setopt(pycurl.PROXYUSERPWD, str("%s:%s" % (proxy['username'], proxy['password'])))
if ipv6:
self.c.setopt(pycurl.IPRESOLVE, pycurl.IPRESOLVE_WHATEVER)
@@ -118,10 +118,10 @@ class HTTPRequest(object):
self.c.setopt(pycurl.IPRESOLVE, pycurl.IPRESOLVE_V4)
if "auth" in options:
- self.c.setopt(pycurl.USERPWD, str(options["auth"]))
+ self.c.setopt(pycurl.USERPWD, str(options['auth']))
if "timeout" in options:
- self.c.setopt(pycurl.LOW_SPEED_TIME, options["timeout"])
+ self.c.setopt(pycurl.LOW_SPEED_TIME, options['timeout'])
def addCookies(self):
diff --git a/pyload/network/RequestFactory.py b/pyload/network/RequestFactory.py
index a80882088..0591c5162 100644
--- a/pyload/network/RequestFactory.py
+++ b/pyload/network/RequestFactory.py
@@ -10,6 +10,7 @@ from pyload.network.CookieJar import CookieJar
from pyload.network.XDCCRequest import XDCCRequest
+
class RequestFactory(object):
def __init__(self, core):
@@ -121,6 +122,7 @@ class RequestFactory(object):
else:
self.bucket.setRate(self.core.config.get("download", "max_speed") * 1024)
+
# needs pyreq in global namespace
def getURL(*args, **kwargs):
return pyreq.getURL(*args, **kwargs)
diff --git a/pyload/network/XDCCRequest.py b/pyload/network/XDCCRequest.py
index 01fc2ea78..dff500749 100644
--- a/pyload/network/XDCCRequest.py
+++ b/pyload/network/XDCCRequest.py
@@ -34,10 +34,10 @@ class XDCCRequest(object):
# proxy = None
# if self.proxies.has_key("socks5"):
# proxytype = socks.PROXY_TYPE_SOCKS5
- # proxy = self.proxies["socks5"]
+ # proxy = self.proxies['socks5']
# elif self.proxies.has_key("socks4"):
# proxytype = socks.PROXY_TYPE_SOCKS4
- # proxy = self.proxies["socks4"]
+ # proxy = self.proxies['socks4']
# if proxytype:
# sock = socks.socksocket()
# t = _parse_proxy(proxy)
@@ -145,7 +145,8 @@ class XDCCRequest(object):
@property
def percent(self):
- if not self.filesize: return 0
+ if not self.filesize:
+ return 0
return (self.recv * 100) / self.filesize
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-06 05:56:41 +0100