[Python-checkins] r84031 - in python/branches/release26-maint: Lib/multiprocessing/connection.py Lib/multiprocessing/forking.py Lib/multiprocessing/heap.py Lib/multiprocessing/reduction.py Misc/NEWS

[brian.curtin]

Author: brian.curtin
Date: Sat Aug 14 19:09:55 2010
New Revision: 84031

Log:
Fix #9600. Don't use relative imports for _multiprocessing on Windows.
Same fix as #9513 on 3.x.


Modified:
   python/branches/release26-maint/Lib/multiprocessing/connection.py
   python/branches/release26-maint/Lib/multiprocessing/forking.py
   python/branches/release26-maint/Lib/multiprocessing/heap.py
   python/branches/release26-maint/Lib/multiprocessing/reduction.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/multiprocessing/connection.py
==============================================================================
--- python/branches/release26-maint/Lib/multiprocessing/connection.py	(original)
+++ python/branches/release26-maint/Lib/multiprocessing/connection.py	Sat Aug 14 19:09:55 2010
@@ -173,7 +173,7 @@
 
 else:
 
-    from ._multiprocessing import win32
+    from _multiprocessing import win32
 
     def Pipe(duplex=True):
         '''

Modified: python/branches/release26-maint/Lib/multiprocessing/forking.py
==============================================================================
--- python/branches/release26-maint/Lib/multiprocessing/forking.py	(original)
+++ python/branches/release26-maint/Lib/multiprocessing/forking.py	Sat Aug 14 19:09:55 2010
@@ -150,7 +150,7 @@
     import _subprocess
     import time
 
-    from ._multiprocessing import win32, Connection, PipeConnection
+    from _multiprocessing import win32, Connection, PipeConnection
     from .util import Finalize
 
     #try:

Modified: python/branches/release26-maint/Lib/multiprocessing/heap.py
==============================================================================
--- python/branches/release26-maint/Lib/multiprocessing/heap.py	(original)
+++ python/branches/release26-maint/Lib/multiprocessing/heap.py	Sat Aug 14 19:09:55 2010
@@ -26,7 +26,7 @@
 
 if sys.platform == 'win32':
 
-    from ._multiprocessing import win32
+    from _multiprocessing import win32
 
     class Arena(object):
 

Modified: python/branches/release26-maint/Lib/multiprocessing/reduction.py
==============================================================================
--- python/branches/release26-maint/Lib/multiprocessing/reduction.py	(original)
+++ python/branches/release26-maint/Lib/multiprocessing/reduction.py	Sat Aug 14 19:09:55 2010
@@ -34,7 +34,7 @@
 
 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(

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sat Aug 14 19:09:55 2010
@@ -12,6 +12,8 @@
 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).