bpo-42406: Fix whichmodule() with multiprocessing (GH-23403)

miss-islington · renatolfc · web-flow · commit fcf7391f598e · 2020-11-29T10:47:31.000-08:00
* bpo-42406: Fix whichmodule() with multiprocessing Signed-off-by: Renato L. de F. Cunha <renatoc@br.ibm.com> Co-authored-by: Gregory P. Smith <greg@krypto.org> (cherry picked from commit 8668431) Co-authored-by: Renato Cunha <renatocunha@acm.org>
diff --git a/Lib/pickle.py b/Lib/pickle.py
@@ -340,7 +340,9 @@ def whichmodule(obj, name):
     # Protect the iteration by using a list copy of sys.modules against dynamic
     # modules that trigger imports of other modules upon calls to getattr.
     for module_name, module in sys.modules.copy().items():
-        if module_name == '__main__' or module is None:
+        if (module_name == '__main__'
+            or module_name == '__mp_main__'  # bpo-42406
+            or module is None):
             continue
         try:
             if _getattribute(module, name)[0] is obj:
diff --git a/Misc/NEWS.d/next/Library/2020-11-19-10-44-41.bpo-42406.r9rNCj.rst b/Misc/NEWS.d/next/Library/2020-11-19-10-44-41.bpo-42406.r9rNCj.rst
@@ -0,0 +1,3 @@
+We fixed an issue in `pickle.whichmodule` in which importing
+`multiprocessing` could change the how pickle identifies which module an
+object belongs to, potentially breaking the unpickling of those objects.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+We fixed an issue in `pickle.whichmodule` in which importing
	`2`	+`multiprocessing` could change the how pickle identifies which module an
	`3`	`+object belongs to, potentially breaking the unpickling of those objects.`