mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Apply Amaury's patch to multiprocessing for issue 3125, removes the copy_reg and replaces it with ForkingPickler.register(), which should resolve the conflict with the global registry/ctypes

Browse source
This commit is contained in:
Jesse Noller 2008-07-16 14:32:36 +00:00
parent a6c5dc07f4
commit 13e9d582fd
6 changed files with 69 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/multiprocessing/reduction.py
View file

@ -13,11 +13,10 @@ import os
import sys
import socket
import threading
import copy_reg
import _multiprocessing
from multiprocessing import current_process
from multiprocessing.forking import Popen, duplicate, close
from multiprocessing.forking import Popen, duplicate, close, ForkingPickler
from multiprocessing.util import register_after_fork, debug, sub_debug
from multiprocessing.connection import Client, Listener
@ -134,7 +133,7 @@ def rebuild_handle(pickled_data):
return new_handle
#
# Register `_multiprocessing.Connection` with `copy_reg`
# Register `_multiprocessing.Connection` with `ForkingPickler`
#
def reduce_connection(conn):
@ -147,10 +146,10 @@ def rebuild_connection(reduced_handle, readable, writable):
handle, readable=readable, writable=writable
)
copy_reg.pickle(_multiprocessing.Connection, reduce_connection)
ForkingPickler.register(_multiprocessing.Connection, reduce_connection)
#
# Register `socket.socket` with `copy_reg`
# Register `socket.socket` with `ForkingPickler`
#
def fromfd(fd, family, type_, proto=0):
@ -169,10 +168,10 @@ def rebuild_socket(reduced_handle, family, type_, proto):
close(fd)
return _sock
copy_reg.pickle(socket.socket, reduce_socket)
ForkingPickler.register(socket.socket, reduce_socket)
#
# Register `_multiprocessing.PipeConnection` with `copy_reg`
# Register `_multiprocessing.PipeConnection` with `ForkingPickler`
#
if sys.platform == 'win32':
@ -187,4 +186,4 @@ if sys.platform == 'win32':
handle, readable=readable, writable=writable
)
copy_reg.pickle(_multiprocessing.PipeConnection, reduce_pipe_connection)
ForkingPickler.register(_multiprocessing.PipeConnection, reduce_pipe_connection)