diff options
author | 2015-04-12 19:23:51 +0200 | |
---|---|---|
committer | 2015-04-12 19:23:51 +0200 | |
commit | f0afbee15380bf5fc242fb3dd5439a9ea9c67d5c (patch) | |
tree | 7e82c022c157a39232fc590ab2ffa69787f5d260 /pyload/manager/event/Scheduler.py | |
parent | Cleanup (diff) | |
parent | import fixes + code-cleanup (diff) | |
download | pyload-f0afbee15380bf5fc242fb3dd5439a9ea9c67d5c.tar.xz |
Merge branch 'pr/n3_ardi69' into 0.4.10
Conflicts:
pyload/plugin/Plugin.py
pyload/webui/app/pyloadweb.py
Diffstat (limited to 'pyload/manager/event/Scheduler.py')
-rw-r--r-- | pyload/manager/event/Scheduler.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyload/manager/event/Scheduler.py b/pyload/manager/event/Scheduler.py index fd428a956..2cb537383 100644 --- a/pyload/manager/event/Scheduler.py +++ b/pyload/manager/event/Scheduler.py @@ -5,6 +5,7 @@ from time import time from heapq import heappop, heappush from threading import Lock, Thread + class AlreadyCalled(Exception): pass @@ -40,7 +41,6 @@ class Scheduler(object): self.queue.put((t, j)) return d - def removeJob(self, d): """ :param d: defered object |