X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;ds=inline;f=decorator_utils.py;h=03e7c880433fad5d359a2bb3acc29a4266204e65;hb=7accf1acb956f55e875b863c53989fd1950e4b5b;hp=4d882bed7ac4486db741b76b587b402a6dac147e;hpb=497fb9e21f45ec08e1486abaee6dfa7b20b8a691;p=python_utils.git diff --git a/decorator_utils.py b/decorator_utils.py index 4d882be..03e7c88 100644 --- a/decorator_utils.py +++ b/decorator_utils.py @@ -17,6 +17,7 @@ import traceback from typing import Callable, Optional import warnings +import exceptions import thread_utils logger = logging.getLogger(__name__) @@ -317,14 +318,6 @@ def thunkify(func): # in https://code.google.com/p/verse-quiz/source/browse/trunk/timeout.py -class TimeoutError(AssertionError): - def __init__(self, value: str = "Timed Out"): - self.value = value - - def __str__(self): - return repr(self.value) - - def _raise_exception(exception, error_message: Optional[str]): if error_message is None: raise exception() @@ -417,7 +410,7 @@ class _Timeout(object): def timeout( seconds: float = 1.0, use_signals: Optional[bool] = None, - timeout_exception=TimeoutError, + timeout_exception=exceptions.TimeoutError, error_message="Function call timed out", ): """Add a timeout parameter to a function and return the function.