summaryrefslogtreecommitdiff
path: root/Lib/multiprocessing/util.py
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2012-05-10 16:11:12 +0100
committerRichard Oudkerk <shibturn@gmail.com>2012-05-10 16:11:12 +0100
commit59d5404bc79beaa39c76fb26012238b26e9b0166 (patch)
tree071cc74196e6fcc572c836b6be02a8d9a6bfc276 /Lib/multiprocessing/util.py
parentca5f91b888bc0056fc08d062f65cc783bbba8532 (diff)
downloadcpython-git-59d5404bc79beaa39c76fb26012238b26e9b0166.tar.gz
Issue #14753: Make multiprocessing treat negative timeouts as it did in 3.2
In Python 3.2 and earlier, Process.join() and Connection.poll() treated negative timeouts as zero timeouts. Earlier versions from the 3.3 line of development treat them as infinite timeouts. The patch reverts to the old behaviour.
Diffstat (limited to 'Lib/multiprocessing/util.py')
-rw-r--r--Lib/multiprocessing/util.py15
1 files changed, 0 insertions, 15 deletions
diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
index da99063e57..9b6dac2006 100644
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -295,18 +295,3 @@ class ForkAwareLocal(threading.local):
register_after_fork(self, lambda obj : obj.__dict__.clear())
def __reduce__(self):
return type(self), ()
-
-
-#
-# Automatic retry after EINTR
-#
-
-def _eintr_retry(func):
- @functools.wraps(func)
- def wrapped(*args, **kwargs):
- while True:
- try:
- return func(*args, **kwargs)
- except InterruptedError:
- continue
- return wrapped