From: Brian Curtin <brian.curtin@gmail.com>
Date: Sat, 14 Aug 2010 17:09:55 +0000 (+0000)
Subject: Fix #9600. Don't use relative imports for _multiprocessing on Windows.
X-Git-Tag: v2.6.6rc2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c251bbd6e94ee43f100c8011cbcb5d9a8a1c9b3;p=thirdparty%2FPython%2Fcpython.git

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 b1f5acd05e59..99b338edb183 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 7eda99180ac6..cec184c748b7 100644
--- 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 7e596ca70fa7..697a5f551611 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 1813729e64eb..60e71513e9fc 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(
diff --git a/Misc/NEWS b/Misc/NEWS
index 1ffcb49d6701..cc0ac5cf7246 100644
--- 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).