From bbaac34ea11bf6ffa347a3b1a2effe2b4891fddc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Apr 2015 18:02:35 +0200 Subject: Spare code cosmetics (6) --- pyload/network/Browser.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pyload/network/Browser.py') diff --git a/pyload/network/Browser.py b/pyload/network/Browser.py index d8617fabc..a499336c3 100644 --- a/pyload/network/Browser.py +++ b/pyload/network/Browser.py @@ -124,7 +124,8 @@ class Browser(object): def removeAuth(self): - if "auth" in self.options: del self.options['auth'] + if "auth" in self.options: + del self.options['auth'] self.renewHTTPRequest() @@ -134,7 +135,8 @@ class Browser(object): def deleteOption(self, name): - if name in self.options: del self.options[name] + if name in self.options: + del self.options[name] def clearHeaders(self): -- cgit v1.2.3 From df6943c37f10d98a62ca95881116b8b4debda670 Mon Sep 17 00:00:00 2001 From: fedeG Date: Mon, 20 Apr 2015 18:06:51 +0200 Subject: 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 --- pyload/network/Browser.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'pyload/network/Browser.py') 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 -- cgit v1.2.3 From 5a86c3cb1db6cd87bf9ae22e09dd209cecc0a363 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 20 Apr 2015 22:48:30 +0200 Subject: Spare code cosmetics (8) --- pyload/network/Browser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyload/network/Browser.py') diff --git a/pyload/network/Browser.py b/pyload/network/Browser.py index 1015efd7e..482c2320a 100644 --- a/pyload/network/Browser.py +++ b/pyload/network/Browser.py @@ -91,7 +91,7 @@ class Browser(object): progressNotify=None, disposition=False): """ this can also download ftp """ self._size = 0 - self.dl = HTTPDownload(url, filename, get or {}, post or {}, self.lastEffectiveURL if ref else None, + 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) name = self.dl.download(chunks, resume) self._size = self.dl.size -- cgit v1.2.3