Fix #9600. Don't use relative imports for _multiprocessing on Windows.

Same fix as #9513 on 3.x.

diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index b1f5acd05e5938dea7c433f5743d0196baf314c1..99b338edb183641268a8ff1bae9eeba4f241584e 100644 (file)
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -173,7 +173,7 @@ if sys.platform != 'win32':
 
 else:
 
-    from ._multiprocessing import win32
+    from _multiprocessing import win32
 
     def Pipe(duplex=True):
         '''

diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
index 7eda99180ac6ee93bd9b8ebaf9ac1149e32c8820..cec184c748b7b2429eeae5f06cb01d122f02cf25 100644 (file)
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -150,7 +150,7 @@ else:
     import _subprocess
     import time
 
-    from ._multiprocessing import win32, Connection, PipeConnection
+    from _multiprocessing import win32, Connection, PipeConnection
     from .util import Finalize
 
     #try:

diff --git a/Lib/multiprocessing/heap.py b/Lib/multiprocessing/heap.py
index 7e596ca70fa78e67576e38534f265c9b94112ba7..697a5f551611709385841528b93d9cc7c60924a7 100644 (file)
--- a/Lib/multiprocessing/heap.py
+++ b/Lib/multiprocessing/heap.py
@@ -26,7 +26,7 @@ __all__ = ['BufferWrapper']
 
 if sys.platform == 'win32':
 
-    from ._multiprocessing import win32
+    from _multiprocessing import win32
 
     class Arena(object):
 

diff --git a/Lib/multiprocessing/reduction.py b/Lib/multiprocessing/reduction.py
index 1813729e64eb2f1f178c57734105199690fec2a5..60e71513e9fc212ce9bae0a8749a32c3a26d3b2a 100644 (file)
--- a/Lib/multiprocessing/reduction.py
+++ b/Lib/multiprocessing/reduction.py
@@ -34,7 +34,7 @@ if not(sys.platform == 'win32' or hasattr(_multiprocessing, 'recvfd')):
 
 if sys.platform == 'win32':
     import _subprocess
-    from ._multiprocessing import win32
+    from _multiprocessing import win32
 
     def send_handle(conn, handle, destination_pid):
         process_handle = win32.OpenProcess(

diff --git a/Misc/NEWS b/Misc/NEWS
index 1ffcb49d6701e55b188b77ef0526691ae06ffc35..cc0ac5cf72462a4e228b432a85187d82aec4cef9 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.6.6?
 Library
 -------
 
+- Issue #9600: Don't use relative import for _multiprocessing on Windows.
+
 - Issue #8688: Revert regression introduced in 2.6.6rc1 (making Distutils
   recalculate MANIFEST every time).