Merge d4ecb73 into 648adfe

AntoineCezar · Mar 11, 2018 · 6a3dba0 · 6a3dba0
2 parents 648adfe + d4ecb73
commit 6a3dba0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -10,4 +10,4 @@ Development Lead
 Contributors
 ------------
 
-None yet. Why not be the first?
+* Bryce Guinta
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,11 @@
 History
 -------
 
+1.2.0 (2018-03-11)
+------------------
+
+* Allow sub-second timeout
+
 1.1.1 (2016-09-05)
 ------------------
 

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
 
 setup(
     name='timeoutcontext',
-    version='1.1.1',
+    version='1.2.0',
     description="A signal based timeout context manager",
     long_description=readme + '\n\n' + history,
     author="Antoine Cezar",

diff --git a/tests/test_timeout.py b/tests/test_timeout.py
@@ -73,7 +73,7 @@ def test_it_does_not_replace_alarm_handler_when_seconds_is_zero(self, signal_moc
     @patch('timeoutcontext._timeout.signal')
     def test_it_does_not_set_alarm_when_seconds_is_zero(self, signal_mock):
             with timeout(0):
-                signal_mock.alarm.assert_not_called()
+                signal_mock.setitimer.assert_not_called()
 
     @patch('timeoutcontext._timeout.signal')
     def test_it_does_not_restore_alarm_handler_when_seconds_is_zero(self, signal_mock):
@@ -91,7 +91,7 @@ def test_it_replace_alarm_handler_on_enter(self, signal_mock):
     @patch('timeoutcontext._timeout.signal')
     def test_it_request_alarm_to_be_sent_in_given_seconds_on_enter(self, signal_mock):
         with timeout(2):
-            signal_mock.alarm.assert_called_with(2)
+            signal_mock.setitimer.assert_called_with(signal_mock.ITIMER_REAL, 2)
 
     @patch('timeoutcontext._timeout.signal')
     def test_it_restore_alarm_handler_on_exit(self, signal_mock):

diff --git a/timeoutcontext/_timeout.py b/timeoutcontext/_timeout.py
@@ -62,7 +62,7 @@ def __init__(self, seconds):
     def __enter__(self):
         if self._seconds:
             self._replace_alarm_handler()
-            signal.alarm(self._seconds)
+            signal.setitimer(signal.ITIMER_REAL, self._seconds)
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):