dahjah/func_timeout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge 91b940fd55 into 2bd33c12fd

Browse Source
This commit is contained in:
belongwqz 2017-08-10 08:04:36 +00:00 committed by GitHub
commit fa05ce2cf0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
func_timeout/dafunc.py
View File

@ -18,6 +18,8 @@ import sys
from .exceptions import FunctionTimedOut from .exceptions import FunctionTimedOut
from .StoppableThread import StoppableThread from .StoppableThread import StoppableThread
from functools import wraps
try: try:
from .py3_raise import raise_exception from .py3_raise import raise_exception
except SyntaxError: except SyntaxError:
@ -179,17 +181,16 @@ def func_set_timeout(timeout, allowOverride=False):
if not allowOverride and not isTimeoutAFunction: if not allowOverride and not isTimeoutAFunction:
# Only defaultTimeout provided. Simple function wrapper # Only defaultTimeout provided. Simple function wrapper
def _function_decorator(func): def _function_decorator(func):
@wraps(func)
return lambda *args, **kwargs : func_timeout(defaultTimeout, func, args=args, kwargs=kwargs) def _function_wrapper(*args, **kwargs):
return func_timeout(defaultTimeout, func, args=args, kwargs=kwargs)
# def _function_wrapper(*args, **kwargs): return _function_wrapper
# return func_timeout(defaultTimeout, func, args=args, kwargs=kwargs)
# return _function_wrapper
return _function_decorator return _function_decorator
if not isTimeoutAFunction: if not isTimeoutAFunction:
# allowOverride is True and timeout is not a function. Simple conditional on every call # allowOverride is True and timeout is not a function. Simple conditional on every call
def _function_decorator(func): def _function_decorator(func):
@wraps(func)
def _function_wrapper(*args, **kwargs): def _function_wrapper(*args, **kwargs):
if 'forceTimeout' in kwargs: if 'forceTimeout' in kwargs:
useTimeout = kwargs.pop('forceTimeout') useTimeout = kwargs.pop('forceTimeout')
@ -209,6 +210,7 @@ def func_set_timeout(timeout, allowOverride=False):
# Could use a lambda here... but want traceback to highlight the calculate function, # Could use a lambda here... but want traceback to highlight the calculate function,
# and not the invoked function # and not the invoked function
def _function_decorator(func): def _function_decorator(func):
@wraps(func)
def _function_wrapper(*args, **kwargs): def _function_wrapper(*args, **kwargs):
if 'forceTimeout' in kwargs: if 'forceTimeout' in kwargs:
useTimeout = kwargs.pop('forceTimeout') useTimeout = kwargs.pop('forceTimeout')
@ -222,6 +224,7 @@ def func_set_timeout(timeout, allowOverride=False):
# Cannot override, and calculate timeout function # Cannot override, and calculate timeout function
def _function_decorator(func): def _function_decorator(func):
@wraps(func)
def _function_wrapper(*args, **kwargs): def _function_wrapper(*args, **kwargs):
useTimeout = timeoutFunction(*args, **kwargs) useTimeout = timeoutFunction(*args, **kwargs)