some update

This commit is contained in:
Miroslav Stampar
2010-04-06 14:59:31 +00:00
parent 60f04f0a41
commit c24f1cc07c
8 changed files with 45 additions and 39 deletions

View File

@@ -2,22 +2,26 @@
import threading
def timeout(func, args=(), kwargs={}, timeout_duration=1, default=None):
def timeout(func, args=(), kwargs={}, duration=1, default=None):
class InterruptableThread(threading.Thread):
def __init__(self):
threading.Thread.__init__(self)
self.exceeded = False
self.exceptionMsg = None
self.result = None
def run(self):
try:
self.result = func(*args, **kwargs)
except:
except Exception, msg:
self.exceptionMsg = msg
self.result = default
thread = InterruptableThread()
thread.start()
thread.join(timeout_duration)
if thread.isAlive():
thread.join(duration)
self.exceeded = thread.isAlive()
if self.exceeded:
return default
else:
return thread.result