summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2014-03-23 12:42:28 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2014-03-23 12:42:28 (GMT)
commit3e952d56ea1c50294cf3445dac5dc6a8ad27fbbe (patch)
tree28356da015a906f229852d5271b1e65d5e8dd400
parent56d3a03f706b54be307f7627db6d881eb851d2b1 (diff)
downloadcpython-3e952d56ea1c50294cf3445dac5dc6a8ad27fbbe.zip
cpython-3e952d56ea1c50294cf3445dac5dc6a8ad27fbbe.tar.gz
cpython-3e952d56ea1c50294cf3445dac5dc6a8ad27fbbe.tar.bz2
Issue #20633: Replace relative import by absolute import.
-rw-r--r--Lib/multiprocessing/forking.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
index 9793237..449978a 100644
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -132,7 +132,7 @@ if sys.platform != 'win32':
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/Misc/NEWS b/Misc/NEWS
index f444272..187d4b2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,8 @@ Core and Builtins
Library
-------
+- Issue #20633: Replace relative import by absolute import.
+
- Issue #20875: Prevent possible gzip "'read' is not defined" NameError.
Patch by Claudiu Popa.