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/Bucket.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/Bucket.py')
| -rw-r--r-- | pyload/network/Bucket.py | 7 |
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 |