From df6943c37f10d98a62ca95881116b8b4debda670 Mon Sep 17 00:00:00 2001
From: fedeG <federicogonzalez761@gmail.com>
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/Bucket.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'pyload/network/Bucket.py')

diff --git a/pyload/network/Bucket.py b/pyload/network/Bucket.py
index 5f8260384..2f957fcad 100644
--- a/pyload/network/Bucket.py
+++ b/pyload/network/Bucket.py
@@ -17,7 +17,7 @@ class Bucket(object):
 
 
     def __nonzero__(self):
-        return False if self.rate < MIN_RATE else True
+        return self.rate >= MIN_RATE
 
 
     def setRate(self, rate):
@@ -35,10 +35,7 @@ class Bucket(object):
         self.calc_tokens()
         self.tokens -= amount
 
-        if self.tokens < 0:
-            time = -self.tokens/float(self.rate)
-        else:
-            time = 0
+        time = -self.tokens / float(self.rate) if self.tokens < 0 else 0
 
         self.lock.release()
         return time
-- 
cgit v1.2.3