Issue #3125: Remove copy_reg in multiprocessing and replace it with
ForkingPickler.register() to resolve conflict with ctypes.
diff --git a/Lib/multiprocessing/reduction.py b/Lib/multiprocessing/reduction.py
index 010d871..1813729 100644
--- a/Lib/multiprocessing/reduction.py
+++ b/Lib/multiprocessing/reduction.py
@@ -13,11 +13,10 @@
import sys
import socket
import threading
-import copyreg
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 @@
return new_handle
#
-# Register `_multiprocessing.Connection` with `copy_reg`
+# Register `_multiprocessing.Connection` with `ForkingPickler`
#
def reduce_connection(conn):
@@ -147,10 +146,10 @@
handle, readable=readable, writable=writable
)
-copyreg.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 @@
close(fd)
return _sock
-copyreg.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 @@
handle, readable=readable, writable=writable
)
- copyreg.pickle(_multiprocessing.PipeConnection, reduce_pipe_connection)
+ ForkingPickler.register(_multiprocessing.PipeConnection, reduce_pipe_connection)