Commits

Floris Bruynooghe  committed b3064ba

Python 3.x compatibility

In 3.x you can no longer compare None and integers.

  • Participants
  • Parent commits 20c6947

Comments (0)

Files changed (1)

File pytest_timeout.py

 def pytest_runtest_setup(item):
     """Setup up a timeout trigger and handler"""
     timeout, method = get_params(item)
-    if timeout <= 0:        # None < 0
+    if timeout is None or timeout <= 0:
         return
     if method == 'signal':
         def handler(signum, frame):