From a6a3274aadfbf9ce03addbef5a68f7701458a3a6 Mon Sep 17 00:00:00 2001 From: Brian Curtin Date: Wed, 4 Aug 2010 15:47:24 +0000 Subject: 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). --- Lib/multiprocessing/connection.py | 2 +- Lib/multiprocessing/forking.py | 2 +- Lib/multiprocessing/heap.py | 2 +- Lib/multiprocessing/reduction.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py index b632e93..7d565a7 100644 --- 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 5d66fa3..a7e8eb7 100644 --- 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 ab6cf16..5d27b27 100644 --- 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 1813729..60e7151 100644 --- 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( -- cgit v0.12