[Python-checkins] r83722 - in python/branches/py3k/Lib/multiprocessing: connection.py forking.py heap.py reduction.py

[brian.curtin]

Author: brian.curtin
Date: Wed Aug  4 17:47:24 2010
New Revision: 83722

Log:
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).


Modified:
   python/branches/py3k/Lib/multiprocessing/connection.py
   python/branches/py3k/Lib/multiprocessing/forking.py
   python/branches/py3k/Lib/multiprocessing/heap.py
   python/branches/py3k/Lib/multiprocessing/reduction.py

Modified: python/branches/py3k/Lib/multiprocessing/connection.py
==============================================================================
--- python/branches/py3k/Lib/multiprocessing/connection.py	(original)
+++ python/branches/py3k/Lib/multiprocessing/connection.py	Wed Aug  4 17:47:24 2010
@@ -173,7 +173,7 @@
 
 else:
 
-    from ._multiprocessing import win32
+    from _multiprocessing import win32
 
     def Pipe(duplex=True):
         '''

Modified: python/branches/py3k/Lib/multiprocessing/forking.py
==============================================================================
--- python/branches/py3k/Lib/multiprocessing/forking.py	(original)
+++ python/branches/py3k/Lib/multiprocessing/forking.py	Wed Aug  4 17:47:24 2010
@@ -157,7 +157,7 @@
     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):

Modified: python/branches/py3k/Lib/multiprocessing/heap.py
==============================================================================
--- python/branches/py3k/Lib/multiprocessing/heap.py	(original)
+++ python/branches/py3k/Lib/multiprocessing/heap.py	Wed Aug  4 17:47:24 2010
@@ -26,7 +26,7 @@
 
 if sys.platform == 'win32':
 
-    from ._multiprocessing import win32
+    from _multiprocessing import win32
 
     class Arena(object):
 

Modified: python/branches/py3k/Lib/multiprocessing/reduction.py
==============================================================================
--- python/branches/py3k/Lib/multiprocessing/reduction.py	(original)
+++ python/branches/py3k/Lib/multiprocessing/reduction.py	Wed Aug  4 17:47:24 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(