diff options
| author | Patrick <pnpnpn@users.noreply.github.com> | 2015-02-15 15:17:57 -0500 |
|---|---|---|
| committer | Patrick <pnpnpn@users.noreply.github.com> | 2015-02-15 15:17:57 -0500 |
| commit | 2304ff00ac08985ead06d0225591fa6508772ab2 (patch) | |
| tree | a5b45496be1c9ea4730b07af11c3ce3e4381a018 | |
| parent | e880269a6fdcacdb961cbaa680f22e9484252036 (diff) | |
| parent | 803297e41ca76451bc235892a31c48f5289650f8 (diff) | |
| download | timeout-decorator-2304ff00ac08985ead06d0225591fa6508772ab2.tar.gz | |
Merge pull request #14 from nugend/unset-alarm
Unset alarm before removing SIGALRM handler
| -rw-r--r-- | timeout_decorator/timeout_decorator.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/timeout_decorator/timeout_decorator.py b/timeout_decorator/timeout_decorator.py index 00c3579..f4bb024 100644 --- a/timeout_decorator/timeout_decorator.py +++ b/timeout_decorator/timeout_decorator.py @@ -45,8 +45,8 @@ def timeout(seconds=None): try: result = f(*args, **kwargs) finally: + signal.alarm(0) signal.signal(signal.SIGALRM, old) - signal.alarm(0) return result return new_f return decorate |