diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-12-27 12:46:59 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-12-27 12:46:59 -0500 |
| commit | a78f0158a28734f965218b834ea8c0b166b7353f (patch) | |
| tree | dca70268e2a41d49658e7eed783c6fc243d119cd /Lib/pickle.py | |
| parent | ec8e6895a3ce9cd69b6ceb75a15fcc74d4a522dc (diff) | |
| parent | bf64d9064ab641b1ef9a0c4bda097ebf1204faf4 (diff) | |
| download | cpython-git-revert-23107-revert-13893-fix-issue-37193.tar.gz | |
Merge branch 'master' into revert-23107-revert-13893-fix-issue-37193revert-23107-revert-13893-fix-issue-37193
Diffstat (limited to 'Lib/pickle.py')
| -rw-r--r-- | Lib/pickle.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py index cbac5f168b..e63a8b6e4d 100644 --- 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: |