Merge 3.4.

This commit is contained in:
Richard Oudkerk 2014-03-23 12:53:48 +00:00
commit 1811687122
3 changed files with 4 additions and 2 deletions

View File

@ -47,7 +47,7 @@ class Popen(object):
def wait(self, timeout=None):
if self.returncode is None:
if timeout is not None:
from .connection import wait
from multiprocessing.connection import wait
if not wait([self.sentinel], timeout):
return None
# This shouldn't block if wait() returned successfully.

View File

@ -57,7 +57,7 @@ class Popen(popen_fork.Popen):
def poll(self, flag=os.WNOHANG):
if self.returncode is None:
from .connection import wait
from multiprocessing.connection import wait
timeout = 0 if flag == os.WNOHANG else None
if not wait([self.sentinel], timeout):
return None

View File

@ -23,6 +23,8 @@ Core and Builtins
Library
-------
- Issue #20633: Replace relative import by absolute import.
- Issue #20980: Stop wrapping exception when using ThreadPool.
- Issue #20990: Fix issues found by pyflakes for multiprocessing.