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 /Lib/multiprocessing/forking.py | |
| 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).
........
Diffstat (limited to 'Lib/multiprocessing/forking.py')
| -rw-r--r-- | Lib/multiprocessing/forking.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): |