using wrapt instead of wraps, refractoring only use one wrapped function, change Exception, adding powerful eval option

.travis.yml

@@ -3,23 +3,26 @@ sudo: false
 python:
 - '2.6'
 - '2.7'
-- '3.2'
-- '3.3'
 - '3.4'
 - '3.5'
 - '3.6'
+- '3.7-dev'
+- 'pypy'
+- 'pypy3'
 install:
 - if [[ $TRAVIS_PYTHON_VERSION == 3.2 ]]; then pip install -U "virtualenv<14.0.0"; fi
-- pip install python-coveralls tox tox-travis
+- pip install tox tox-travis dill multiprocess wrapt pytest-cov coverage codecov
 script: tox --recreate
+
 after_success:
 - pip install -e .
-- py.test --cov=timeout_decorator --cov-report=term-missing tests
-- coveralls
-deploy:
-  provider: pypi
-  user: png
-  password:
-    secure: ZXoq3kgfu+IICjhhmQZr0s0xE6bvWzH04GjdE/VL4BxdDdGI4fHEwudGEjzLXJbt2d09vNOO67Nqam+MwPWtq+WZEP69g/Fhyy4kbkuUl/CMeqashQzU/N+3lwv97Y2qvzTUwDnSoz4zyBFu67SSrovKruFsYaiH00bwvWcvLa0=
-  on:
-    python: 2.7
+- py.test --cov=./
+- codecov
+
+# deploy:
+#   provider: pypi
+#   user: png
+#   password:
+#     secure: ZXoq3kgfu+IICjhhmQZr0s0xE6bvWzH04GjdE/VL4BxdDdGI4fHEwudGEjzLXJbt2d09vNOO67Nqam+MwPWtq+WZEP69g/Fhyy4kbkuUl/CMeqashQzU/N+3lwv97Y2qvzTUwDnSoz4zyBFu67SSrovKruFsYaiH00bwvWcvLa0=
+#   on:
+#     python: 2.7

Makefile

@@ -4,7 +4,7 @@ venv:
 
 # install all needed for development
 develop: venv
-	venv/bin/pip install -e . -r requirements-testing.txt tox
+	venv/bin/pip install -e . -r requirements.txt tox
 
 # clean the development envrironment
 clean:

README.rst

@@ -1,7 +1,7 @@
 Timeout decorator
 =================
 
-|Build Status| |Pypi Status| |Coveralls Status|
+|Build Status| |Pypi Status| |Codecov Status|
 
 Installation
 ------------
@@ -28,10 +28,10 @@ Usage
 
     @timeout_decorator.timeout(5)
     def mytest():
-        print "Start"
+        print("Start")
         for i in range(1,10):
             time.sleep(1)
-            print "%d seconds have passed" % i
+            print("{} seconds have passed".format(i))
 
     if __name__ == '__main__':
         mytest()
@@ -45,10 +45,10 @@ Specify an alternate exception to raise on timeout:
 
     @timeout_decorator.timeout(5, timeout_exception=StopIteration)
     def mytest():
-        print "Start"
+        print("Start")
         for i in range(1,10):
             time.sleep(1)
-            print "%d seconds have passed" % i
+            print("{} seconds have passed".format(i))
 
     if __name__ == '__main__':
         mytest()
@@ -73,7 +73,7 @@ case - by using multiprocessing. To use it, just pass
         print "Start"
         for i in range(1,10):
             time.sleep(1)
-            print "%d seconds have passed" % i
+            print("{} seconds have passed".format(i))
 
     if __name__ == '__main__':
         mytest()
@@ -107,5 +107,5 @@ See `License file <https://github.com/pnpnpn/timeout-decorator/blob/master/LICEN
    :target: https://travis-ci.org/pnpnpn/timeout-decorator
 .. |Pypi Status| image:: https://badge.fury.io/py/timeout-decorator.svg
     :target: https://badge.fury.io/py/timeout-decorator
-.. |Coveralls Status| image:: https://coveralls.io/repos/pnpnpn/timeout-decorator/badge.png?branch=master
-    :target: https://coveralls.io/r/pnpnpn/timeout-decorator
+.. |Codecov Status| image:: https://codecov.io/gh/bitranox/wrapt-timeout-decorator/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/bitranox/wrapt-timeout-decorator

requirements.txt

@@ -0,0 +1,3 @@
+dill
+multiprocess
+wrapt

setup.py

@@ -32,7 +32,7 @@
     long_description=long_description,
     author='Patrick Ng',
     author_email='pn.appdev@gmail.com',
-    url='https://github.com/pnpnpn/timeout-decorator',
+    url='https://github.com/bitranox/timeout-decorator',
     packages=['timeout_decorator'],
-    install_requires=[],
+    install_requires=['dill', 'multiprocess', 'wrapt'],
     classifiers=CLASSIFIERS)

tests/test_timeout_decorator.py

@@ -1,9 +1,13 @@
 """Timeout decorator tests."""
+from timeout_decorator import timeout
+import pytest
+import sys
 import time
+from dill import PicklingError
 
-import pytest
 
-from timeout_decorator import timeout, TimeoutError
+if sys.version_info < (3, 3):             # there is no TimeoutError < Python 3.3
+    TimeoutError = AssertionError
 
 
 @pytest.fixture(params=[False, True])
@@ -20,29 +24,38 @@ def f():
         f()
 
 
-def test_timeout_class_method(use_signals):
+def test_timeout_class_method_use_signals():
     class c():
-        @timeout(1, use_signals=use_signals)
+        @timeout(1, use_signals=True)
         def f(self):
             time.sleep(2)
     with pytest.raises(TimeoutError):
         c().f()
 
 
+def test_timeout_class_method_dont_use_signals():
+    class c():
+        @timeout(1, use_signals=False)
+        def f(self):
+            time.sleep(2)
+    with pytest.raises(PicklingError):
+        c().f()
+
+
 def test_timeout_kwargs(use_signals):
     @timeout(3, use_signals=use_signals)
     def f():
         time.sleep(2)
     with pytest.raises(TimeoutError):
-        f(timeout=1)
+        f(dec_timeout=1)
 
 
 def test_timeout_alternate_exception(use_signals):
     @timeout(3, use_signals=use_signals, timeout_exception=StopIteration)
     def f():
         time.sleep(2)
     with pytest.raises(StopIteration):
-        f(timeout=1)
+        f(dec_timeout=1)
 
 
 def test_timeout_no_seconds(use_signals):
@@ -61,44 +74,67 @@ def f():
 
 
 def test_timeout_ok(use_signals):
-    @timeout(seconds=2, use_signals=use_signals)
+    @timeout(dec_timeout=2, use_signals=use_signals)
     def f():
         time.sleep(1)
     f()
 
 
 def test_function_name(use_signals):
-    @timeout(seconds=2, use_signals=use_signals)
+    @timeout(dec_timeout=2, use_signals=use_signals)
     def func_name():
         pass
 
+    func_name()
     assert func_name.__name__ == 'func_name'
 
 
 def test_timeout_pickle_error():
-    """Test that when a pickle error occurs a timeout error is raised."""
-    @timeout(seconds=1, use_signals=False)
+    """Test that when a pickle error occurs a timeout error is raised"""
+    # codecov start ignore
+    @timeout(dec_timeout=1, use_signals=False)
     def f():
         time.sleep(0.1)
 
         class Test(object):
             pass
         return Test()
-    with pytest.raises(TimeoutError):
+    # codecov end ignore
+    with pytest.raises(PicklingError):
         f()
 
 
 def test_timeout_custom_exception_message():
-    @timeout(seconds=1, exception_message="Custom fail message")
+    @timeout(dec_timeout=1, exception_message="Custom fail message")
     def f():
         time.sleep(2)
     with pytest.raises(TimeoutError, match="Custom fail message"):
         f()
 
 
 def test_timeout_default_exception_message():
-    @timeout(seconds=1)
+    @timeout(dec_timeout=1)
     def f():
         time.sleep(2)
-    with pytest.raises(TimeoutError, match="Timed Out"):
+    with pytest.raises(TimeoutError, match="Function f timed out after 1 seconds"):
+        f()
+
+
+def test_timeout_eval(use_signals):
+    """ Test Eval """
+    @timeout(dec_timeout='args[0] * 2', use_signals=use_signals, dec_allow_eval=True)
+    def f(x):
+        time.sleep(0.4)
+    f(0.3)
+    with pytest.raises(TimeoutError):
+        f(0.1)
+
+
+def test_exception(use_signals):
+    """ Test Exception """
+    @timeout(0.4, use_signals=use_signals)
+    def f():
+        raise AssertionError
+
+    with pytest.raises(AssertionError):
         f()

timeout_decorator/__init__.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from .timeout_decorator import timeout
-from .timeout_decorator import TimeoutError
 
 __title__ = 'timeout_decorator'
 __version__ = '0.4.0'