1.0.1 - Remove debug print, add ChangeLog, update documentation a bit
This commit is contained in:
parent
f0e551c8af
commit
08052219f1
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,3 +4,5 @@
|
|||||||
build/
|
build/
|
||||||
dist/
|
dist/
|
||||||
*.egg-info/
|
*.egg-info/
|
||||||
|
myenv/
|
||||||
|
__pycache__/
|
||||||
|
|||||||
3
ChangeLog
Normal file
3
ChangeLog
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
* 1.0.1 - Mar 15 2016
|
||||||
|
- Remove debugging print
|
||||||
|
- Note that it has been explicitly tested on 2.7, 3.4, and 3.5 in README.
|
||||||
@ -3,5 +3,6 @@ include LICENSE
|
|||||||
include README.md
|
include README.md
|
||||||
include README.rst
|
include README.rst
|
||||||
include MANIFEST.in
|
include MANIFEST.in
|
||||||
|
include ChangeLog
|
||||||
recursive-include func_timeout *.py
|
recursive-include func_timeout *.py
|
||||||
recursive-include doc *.html
|
recursive-include doc *.html
|
||||||
|
|||||||
@ -52,4 +52,6 @@ So, for esxample, if you have a function "doit('arg1', 'arg2')" that you want to
|
|||||||
Support
|
Support
|
||||||
-------
|
-------
|
||||||
|
|
||||||
I've tested func\_timeout with python 2.7 and python 3.5.
|
I've tested func\_timeout with python 2.7, 3.4, and 3.5. It should work on other versions as well.
|
||||||
|
|
||||||
|
ChangeLog can be found at https://github.com/kata198/func_timeout/ChangeLog
|
||||||
|
|||||||
@ -71,4 +71,6 @@ So, for esxample, if you have a function "doit('arg1', 'arg2')" that you want to
|
|||||||
Support
|
Support
|
||||||
-------
|
-------
|
||||||
|
|
||||||
I've tested func_timeout with python 2.7 and python 3.5.
|
I've tested func\_timeout with python 2.7, 3.4, and 3.5. It should work on other versions as well.
|
||||||
|
|
||||||
|
ChangeLog can be found at https://github.com/kata198/func_timeout/ChangeLog
|
||||||
|
|||||||
@ -5,12 +5,11 @@
|
|||||||
LICENSE, otherwise it is available at https://github.com/kata198/func_timeout/LICENSE
|
LICENSE, otherwise it is available at https://github.com/kata198/func_timeout/LICENSE
|
||||||
'''
|
'''
|
||||||
|
|
||||||
import sys
|
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
|
|
||||||
__version__ = '1.0.0'
|
__version__ = '1.0.1'
|
||||||
__version_tuple__ = (1, 0, 0)
|
__version_tuple__ = (1, 0, 1)
|
||||||
|
|
||||||
__all__ = ('func_timeout', 'FunctionTimedOut')
|
__all__ = ('func_timeout', 'FunctionTimedOut')
|
||||||
|
|
||||||
@ -39,7 +38,6 @@ def func_timeout(timeout, func, args=(), kwargs=None):
|
|||||||
exception = []
|
exception = []
|
||||||
|
|
||||||
def funcwrap(args2, kwargs2):
|
def funcwrap(args2, kwargs2):
|
||||||
sys.stdout.write('Args2: %s\nkwargs2: %s\n' %(str(args2), str(kwargs2)))
|
|
||||||
try:
|
try:
|
||||||
ret.append( func(*args2, **kwargs2) )
|
ret.append( func(*args2, **kwargs2) )
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
2
setup.py
2
setup.py
@ -30,7 +30,7 @@ if __name__ == '__main__':
|
|||||||
log_description = summary
|
log_description = summary
|
||||||
|
|
||||||
setup(name='func_timeout',
|
setup(name='func_timeout',
|
||||||
version='1.0.0',
|
version='1.0.1',
|
||||||
packages=['func_timeout'],
|
packages=['func_timeout'],
|
||||||
author='Tim Savannah',
|
author='Tim Savannah',
|
||||||
author_email='kata198@gmail.com',
|
author_email='kata198@gmail.com',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user