diff options
| -rw-r--r-- | decorator_utils.py | 11 | ||||
| -rw-r--r-- | exceptions.py | 5 |
2 files changed, 6 insertions, 10 deletions
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. diff --git a/exceptions.py b/exceptions.py index 3ce94d3..3e0a2d0 100644 --- a/exceptions.py +++ b/exceptions.py @@ -9,5 +9,8 @@ class PostconditionException(AssertionError): class TimeoutError(Exception): - pass + def __init__(self, value: str = "Timed out"): + self.value = value + def __str__(self): + return repr(self.value) |