summaryrefslogtreecommitdiffstats
path: root/pyload/network/Bucket.py
diff options
context:
space:
mode:
authorGravatar ardi69 <armin@diedering.de> 2015-04-21 06:51:24 +0200
committerGravatar ardi69 <armin@diedering.de> 2015-04-21 06:51:24 +0200
commit2f8433b6a10505d29a1b63ea8bbd9b0bf3f7d9f6 (patch)
treeb82a8b5fc0a309f69733b0a004284f4ef45833d8 /pyload/network/Bucket.py
parentadded check of classname == filename (diff)
parentMerge branch 'pr/n10_ardi69' into 0.4.10 (diff)
downloadpyload-2f8433b6a10505d29a1b63ea8bbd9b0bf3f7d9f6.tar.xz
Merge pull request #4 from vuolter/0.4.10
vuolter HEAD
Diffstat (limited to 'pyload/network/Bucket.py')
-rw-r--r--pyload/network/Bucket.py7
1 files changed, 2 insertions, 5 deletions
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