Commit 7c251bbd authored by Brian Curtin's avatar Brian Curtin

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

Same fix as #9513 on 3.x.
parent 77cb7ed4
......@@ -173,7 +173,7 @@ if sys.platform != 'win32':
else:
from ._multiprocessing import win32
from _multiprocessing import win32
def Pipe(duplex=True):
'''
......
......@@ -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:
......
......@@ -26,7 +26,7 @@ __all__ = ['BufferWrapper']
if sys.platform == 'win32':
from ._multiprocessing import win32
from _multiprocessing import win32
class Arena(object):
......
......@@ -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(
......
......@@ -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).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment