Skip to content

Commit

Permalink
bpo-42406: Fix whichmodule() with multiprocessing (GH-23403)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
renatolfc and gpshead authored Nov 29, 2020
1 parent 86150d3 commit 8668431
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Lib/pickle.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit 8668431

Please sign in to comment.