mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-11 11:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #21905: Avoid RuntimeError in pickle.whichmodule() when sys.modules is mutated while iterating.

Browse source 
Patch by Olivier Grisel.
This commit is contained in:
Antoine Pitrou 2014-10-04 22:15:27 +02:00
parent fb8eaae6eb
commit e1618491ad
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/pickle.py
View file

@ -280,7 +280,9 @@ def whichmodule(obj, name, allow_qualname=False):
module_name = getattr(obj, '__module__', None) module_name = getattr(obj, '__module__', None)
if module_name is not None: if module_name is not None:
return module_name return module_name
for module_name, module in sys.modules.items(): # 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 list(sys.modules.items()):
if module_name == '__main__' or module is None: if module_name == '__main__' or module is None:
continue continue
try: try:

1
Misc/ACKS
View file

@ -494,6 +494,7 @@ Eddy De Greef
Grant Griffin Grant Griffin
Andrea Griffini Andrea Griffini
Duncan Grisby Duncan Grisby
Olivier Grisel
Fabian Groffen Fabian Groffen
Eric Groo Eric Groo
Dag Gruneau Dag Gruneau

3
Misc/NEWS
View file

@ -22,6 +22,9 @@ Core and Builtins
Library Library
------- -------
- Issue #21905: Avoid RuntimeError in pickle.whichmodule() when sys.modules
is mutated while iterating. Patch by Olivier Grisel.
- Issue #22219: The zipfile module CLI now adds entries for directories - Issue #22219: The zipfile module CLI now adds entries for directories
(including empty directories) in ZIP file. (including empty directories) in ZIP file.