Fix #9513 to remove relative imports from multiprocessing.

The test suite currently skips test_multiprocessing on Windows
because it fails on finding _multiprocessing in several
win32-specific blocks. Removing the relative import lets this
through and allows the test to run (and pass).

diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index b632e931e6c0a93a79a4bfd5c854a8b1219b3137..7d565a701424093c65628be4e25e4c79c50f95a9 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 5d66fa327365f22841a437c75fe4b1e5eb57dd26..a7e8eb79cd248cf147350b6512814854e68c1d61 100644 (file)
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -157,7 +157,7 @@ else:
     import time
 
     from pickle import dump, load, HIGHEST_PROTOCOL
-    from ._multiprocessing import win32, Connection, PipeConnection
+    from _multiprocessing import win32, Connection, PipeConnection
     from .util import Finalize
 
     def dump(obj, file, protocol=None):

diff --git a/Lib/multiprocessing/heap.py b/Lib/multiprocessing/heap.py
index ab6cf1610bb8bde1c86e536abc925ebbfe8bb81f..5d27b27ac3ca7464f95dbf5c69bb45f8c17193d0 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(