diff options
author | fedeG <federicogonzalez761@gmail.com> | 2015-04-20 18:06:51 +0200 |
---|---|---|
committer | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-04-20 23:01:25 +0200 |
commit | df6943c37f10d98a62ca95881116b8b4debda670 (patch) | |
tree | 9b55bc9fca4202d38858098e63563da09b7a1e8c /pyload/network/Browser.py | |
parent | Merge pull request #9 from ardi69/0.4.10 (diff) | |
download | pyload-df6943c37f10d98a62ca95881116b8b4debda670.tar.xz |
PEP-8, Python Zen, refactor and reduce code (part 9 in master module/network)
Conflicts:
module/network/Bucket.py
module/network/CookieJar.py
pyload/network/Browser.py
pyload/network/HTTPChunk.py
pyload/network/HTTPDownload.py
pyload/network/HTTPRequest.py
pyload/network/RequestFactory.py
pyload/network/XDCCRequest.py
Diffstat (limited to 'pyload/network/Browser.py')
-rw-r--r-- | pyload/network/Browser.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pyload/network/Browser.py b/pyload/network/Browser.py index a499336c3..1015efd7e 100644 --- a/pyload/network/Browser.py +++ b/pyload/network/Browser.py @@ -24,7 +24,8 @@ class Browser(object): def renewHTTPRequest(self): - if hasattr(self, "http"): self.http.close() + if hasattr(self, "http"): + self.http.close() self.http = HTTPRequest(self.cj, self.options) @@ -61,16 +62,12 @@ class Browser(object): @property def arrived(self): - if self.dl: - return self.dl.arrived - return 0 + return self.dl.arrived if self.dl else 0 @property def percent(self): - if not self.size: - return 0 - return (self.arrived * 100) / self.size + return (self.arrived * 100) / self.size if self.size else 0 def clearCookies(self): @@ -94,8 +91,8 @@ class Browser(object): progressNotify=None, disposition=False): """ this can also download ftp """ self._size = 0 - self.dl = HTTPDownload(url, filename, get, post, self.lastEffectiveURL if ref else None, - self.cj if cookies else None, self.bucket, self.options, progressNotify, disposition) + self.dl = HTTPDownload(url, filename, get or {}, post or {}, self.lastEffectiveURL if ref else None, + self.cj if cookies else None, self.bucket, self.options, progressNotify, disposition) name = self.dl.download(chunks, resume) self._size = self.dl.size |