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 | |
parent | 80a5be1d84689a680900ff4900acb2a39ec6d2a8 (diff) | |
parent | 3e952d56ea1c50294cf3445dac5dc6a8ad27fbbe (diff) | |
download | cpython-c346060440f342fa0138536057d16fdaf1f974f0.zip cpython-c346060440f342fa0138536057d16fdaf1f974f0.tar.gz cpython-c346060440f342fa0138536057d16fdaf1f974f0.tar.bz2 |
Merge 3.3.
-rw-r--r-- | Lib/multiprocessing/popen_fork.py | 2 | ||||
-rw-r--r-- | Lib/multiprocessing/popen_forkserver.py | 2 | ||||
-rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Lib/multiprocessing/popen_fork.py b/Lib/multiprocessing/popen_fork.py index 463cc18..367e72e 100644 --- a/Lib/multiprocessing/popen_fork.py +++ b/Lib/multiprocessing/popen_fork.py @@ -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. 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 @@ -21,6 +21,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. |