Skip to content

Commit 0805221

Browse files
committed
1.0.1 - Remove debug print, add ChangeLog, update documentation a bit
1 parent f0e551c commit 0805221

File tree

7 files changed

+15
-7
lines changed

7 files changed

+15
-7
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
build/
55
dist/
66
*.egg-info/
7+
myenv/
8+
__pycache__/

ChangeLog

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
* 1.0.1 - Mar 15 2016
2+
- Remove debugging print
3+
- Note that it has been explicitly tested on 2.7, 3.4, and 3.5 in README.

MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ include LICENSE
33
include README.md
44
include README.rst
55
include MANIFEST.in
6+
include ChangeLog
67
recursive-include func_timeout *.py
78
recursive-include doc *.html

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,6 @@ So, for esxample, if you have a function "doit('arg1', 'arg2')" that you want to
5252
Support
5353
-------
5454

55-
I've tested func\_timeout with python 2.7 and python 3.5.
55+
I've tested func\_timeout with python 2.7, 3.4, and 3.5. It should work on other versions as well.
56+
57+
ChangeLog can be found at https://github.com/kata198/func_timeout/ChangeLog

README.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,6 @@ So, for esxample, if you have a function "doit('arg1', 'arg2')" that you want to
7171
Support
7272
-------
7373

74-
I've tested func_timeout with python 2.7 and python 3.5.
74+
I've tested func\_timeout with python 2.7, 3.4, and 3.5. It should work on other versions as well.
75+
76+
ChangeLog can be found at https://github.com/kata198/func_timeout/ChangeLog

func_timeout/__init__.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
LICENSE, otherwise it is available at https://github.com/kata198/func_timeout/LICENSE
66
'''
77

8-
import sys
98
import threading
109
import time
1110

12-
__version__ = '1.0.0'
13-
__version_tuple__ = (1, 0, 0)
11+
__version__ = '1.0.1'
12+
__version_tuple__ = (1, 0, 1)
1413

1514
__all__ = ('func_timeout', 'FunctionTimedOut')
1615

@@ -39,7 +38,6 @@ def func_timeout(timeout, func, args=(), kwargs=None):
3938
exception = []
4039

4140
def funcwrap(args2, kwargs2):
42-
sys.stdout.write('Args2: %s\nkwargs2: %s\n' %(str(args2), str(kwargs2)))
4341
try:
4442
ret.append( func(*args2, **kwargs2) )
4543
except Exception as e:

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
log_description = summary
3131

3232
setup(name='func_timeout',
33-
version='1.0.0',
33+
version='1.0.1',
3434
packages=['func_timeout'],
3535
author='Tim Savannah',
3636
author_email='[email protected]',

0 commit comments

Comments
 (0)