mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged revisions 83722 via svnmerge from

Browse source 
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).
........
This commit is contained in:
Brian Curtin 2010-08-04 15:54:19 +00:00
parent 8661cbe9d1
commit 6aa8bc3442
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/multiprocessing/connection.py
View file

@ -173,7 +173,7 @@ if sys.platform != 'win32':
else: else:
from ._multiprocessing import win32 from _multiprocessing import win32
def Pipe(duplex=True): def Pipe(duplex=True):
''' '''

2
Lib/multiprocessing/forking.py
View file

@ -157,7 +157,7 @@ else:
import time import time
from pickle import dump, load, HIGHEST_PROTOCOL from pickle import dump, load, HIGHEST_PROTOCOL
from ._multiprocessing import win32, Connection, PipeConnection from _multiprocessing import win32, Connection, PipeConnection
from .util import Finalize from .util import Finalize
def dump(obj, file, protocol=None): def dump(obj, file, protocol=None):

2
Lib/multiprocessing/heap.py
View file

@ -26,7 +26,7 @@ __all__ = ['BufferWrapper']
if sys.platform == 'win32': if sys.platform == 'win32':
from ._multiprocessing import win32 from _multiprocessing import win32
class Arena(object): class Arena(object):

2
Lib/multiprocessing/reduction.py
View file

@ -34,7 +34,7 @@ if not(sys.platform == 'win32' or hasattr(_multiprocessing, 'recvfd')):
if sys.platform == 'win32': if sys.platform == 'win32':
import _subprocess import _subprocess
from ._multiprocessing import win32 from _multiprocessing import win32
def send_handle(conn, handle, destination_pid): def send_handle(conn, handle, destination_pid):
process_handle = win32.OpenProcess( process_handle = win32.OpenProcess(