mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Merge 3.3.

Browse source
This commit is contained in:
Richard Oudkerk 2014-03-23 12:52:16 +00:00
commit c346060440
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/multiprocessing/popen_fork.py
View file

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

2
Lib/multiprocessing/popen_forkserver.py
View file

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

2
Misc/NEWS
View file

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