traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-13487: Use sys.modules.copy() in inspect.getmodule() for thread safety. (GH-18786) 

`list(sys.modules.items())` was apparently not immune to "dictionary
changed size during iteration" errors.

Tested internally using an integration test that has run into this a couple of times in the past two years.  With this patch applied, the test is no longer flaky.
(cherry picked from commit 85cf1d514b)

Co-authored-by: Gregory P. Smith <gps@google.com>
This commit is contained in:
Miss Islington (bot) 2020-03-04 17:04:38 -08:00 committed by GitHub
parent 5a3926d559
commit 6b452ff97f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/inspect.py
View File

@ -741,7 +741,7 @@ def getmodule(object, _filename=None):
return sys.modules.get(modulesbyfile[file]) return sys.modules.get(modulesbyfile[file])
# Update the filename to module name cache and check yet again # Update the filename to module name cache and check yet again
# Copy sys.modules in order to cope with changes while iterating # Copy sys.modules in order to cope with changes while iterating
for modname, module in list(sys.modules.items()): for modname, module in sys.modules.copy().items():
if ismodule(module) and hasattr(module, '__file__'): if ismodule(module) and hasattr(module, '__file__'):
f = module.__file__ f = module.__file__
if f == _filesbymodname.get(modname, None): if f == _filesbymodname.get(modname, None):

3
Misc/NEWS.d/next/Library/2020-03-04-16-10-59.bpo-13487.gqe4Fb.rst Normal file
View File

@ -0,0 +1,3 @@
Avoid a possible *"RuntimeError: dictionary changed size during iteration"*
from :func:`inspect.getmodule` when it tried to loop through
:attr:`sys.modules`.