summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing/heap.py
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2010-08-04 15:54:19 (GMT)
committerBrian Curtin <brian.curtin@gmail.com>2010-08-04 15:54:19 (GMT)
commit6aa8bc3442ff4be718e6c8bcd807a84b403c81c7 (patch)
tree18a4351a554791fb765004e06362eded23c3ecb6 /Lib/multiprocessing/heap.py
parent8661cbe9d15df6a45da2d1ca12786d9ce695c23f (diff)
downloadcpython-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/heap.py')
-rw-r--r--Lib/multiprocessing/heap.py2
1 files changed, 1 insertions, 1 deletions
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):