paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply Python 3 futurize transform libmodernize.fixes.fix_raise_six.

Browse Source
This commit is contained in:
Tim Abbott
2015-11-01 08:14:59 -08:00
parent cd6f8e9191
commit 5ffb4deb8d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/timeout.py
View File

@@ -4,6 +4,7 @@ import sys
import time import time
import ctypes import ctypes
import threading import threading
import six
# Based on http://code.activestate.com/recipes/483752/ # Based on http://code.activestate.com/recipes/483752/
@@ -79,5 +80,5 @@ def timeout(timeout, func, *args, **kwargs):
if thread.exc_info: if thread.exc_info:
# Raise the original stack trace so our error messages are more useful. # Raise the original stack trace so our error messages are more useful.
# from http://stackoverflow.com/a/4785766/90777 # from http://stackoverflow.com/a/4785766/90777
raise thread.exc_info[0], thread.exc_info[1], thread.exc_info[2] six.reraise(thread.exc_info[0], thread.exc_info[1], thread.exc_info[2])
return thread.result return thread.result