mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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_forkserver.py
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