mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
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).
This commit is contained in:
parent
482e66a58a
commit
a6a3274aad
4 changed files with 4 additions and 4 deletions
|
@ -173,7 +173,7 @@ if sys.platform != 'win32':
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
||||||
from ._multiprocessing import win32
|
from _multiprocessing import win32
|
||||||
|
|
||||||
def Pipe(duplex=True):
|
def Pipe(duplex=True):
|
||||||
'''
|
'''
|
||||||
|
|
|
@ -157,7 +157,7 @@ else:
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from pickle import dump, load, HIGHEST_PROTOCOL
|
from pickle import dump, load, HIGHEST_PROTOCOL
|
||||||
from ._multiprocessing import win32, Connection, PipeConnection
|
from _multiprocessing import win32, Connection, PipeConnection
|
||||||
from .util import Finalize
|
from .util import Finalize
|
||||||
|
|
||||||
def dump(obj, file, protocol=None):
|
def dump(obj, file, protocol=None):
|
||||||
|
|
|
@ -26,7 +26,7 @@ __all__ = ['BufferWrapper']
|
||||||
|
|
||||||
if sys.platform == 'win32':
|
if sys.platform == 'win32':
|
||||||
|
|
||||||
from ._multiprocessing import win32
|
from _multiprocessing import win32
|
||||||
|
|
||||||
class Arena(object):
|
class Arena(object):
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ if not(sys.platform == 'win32' or hasattr(_multiprocessing, 'recvfd')):
|
||||||
|
|
||||||
if sys.platform == 'win32':
|
if sys.platform == 'win32':
|
||||||
import _subprocess
|
import _subprocess
|
||||||
from ._multiprocessing import win32
|
from _multiprocessing import win32
|
||||||
|
|
||||||
def send_handle(conn, handle, destination_pid):
|
def send_handle(conn, handle, destination_pid):
|
||||||
process_handle = win32.OpenProcess(
|
process_handle = win32.OpenProcess(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue