diff options
| author | Brian Curtin <brian.curtin@gmail.com> | 2010-08-04 15:54:19 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian.curtin@gmail.com> | 2010-08-04 15:54:19 (GMT) |
| commit | 6aa8bc3442ff4be718e6c8bcd807a84b403c81c7 (patch) | |
| tree | 18a4351a554791fb765004e06362eded23c3ecb6 | |
| parent | 8661cbe9d15df6a45da2d1ca12786d9ce695c23f (diff) | |
| download | cpython-6aa8bc3442ff4be718e6c8bcd807a84b403c81c7.zip cpython-6aa8bc3442ff4be718e6c8bcd807a84b403c81c7.tar.gz cpython-6aa8bc3442ff4be718e6c8bcd807a84b403c81c7.tar.bz2 | |
Merged revisions 83722 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83722 | brian.curtin | 2010-08-04 10:47:24 -0500 (Wed, 04 Aug 2010) | 7 lines
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).
........
| -rw-r--r-- | Lib/multiprocessing/connection.py | 2 | ||||
| -rw-r--r-- | Lib/multiprocessing/forking.py | 2 | ||||
| -rw-r--r-- | Lib/multiprocessing/heap.py | 2 | ||||
| -rw-r--r-- | Lib/multiprocessing/reduction.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py index b632e93..7d565a7 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 5d66fa3..a7e8eb7 100644 --- a/Lib/multiprocessing/forking.py +++ b/Lib/multiprocessing/forking.py @@ -157,7 +157,7 @@ else: 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): diff --git a/Lib/multiprocessing/heap.py b/Lib/multiprocessing/heap.py index ab6cf16..5d27b27 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 1813729..60e7151 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( |