diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2014-03-23 12:52:16 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2014-03-23 12:52:16 (GMT) |
| commit | c346060440f342fa0138536057d16fdaf1f974f0 (patch) | |
| tree | 99b0375d0f7e2bf6c7db65cb09cb5bb55974b60e /Lib/multiprocessing/popen_forkserver.py | |
| parent | 80a5be1d84689a680900ff4900acb2a39ec6d2a8 (diff) | |
| parent | 3e952d56ea1c50294cf3445dac5dc6a8ad27fbbe (diff) | |
| download | cpython-c346060440f342fa0138536057d16fdaf1f974f0.zip cpython-c346060440f342fa0138536057d16fdaf1f974f0.tar.gz cpython-c346060440f342fa0138536057d16fdaf1f974f0.tar.bz2 | |
Merge 3.3.
Diffstat (limited to 'Lib/multiprocessing/popen_forkserver.py')
| -rw-r--r-- | Lib/multiprocessing/popen_forkserver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/multiprocessing/popen_forkserver.py b/Lib/multiprocessing/popen_forkserver.py index b115f81..e792194 100644 --- a/Lib/multiprocessing/popen_forkserver.py +++ b/Lib/multiprocessing/popen_forkserver.py @@ -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 |