diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2014-10-04 20:17:26 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2014-10-04 20:17:26 (GMT) |
| commit | 5f6a7556bf3071cc1b1ad409cc3ae41379994df1 (patch) | |
| tree | 10603bfd3e99b7101fa52acb75f83d61dff5a0e0 /Lib/pickle.py | |
| parent | 190517551b183c6e3cf2d333e2ccdcdf3f1d3655 (diff) | |
| parent | e1618491adc5c0ef214c25d4e3b882e8586a2fee (diff) | |
| download | cpython-5f6a7556bf3071cc1b1ad409cc3ae41379994df1.zip cpython-5f6a7556bf3071cc1b1ad409cc3ae41379994df1.tar.gz cpython-5f6a7556bf3071cc1b1ad409cc3ae41379994df1.tar.bz2 | |
Issue #21905: Avoid RuntimeError in pickle.whichmodule() when sys.modules is mutated while iterating.
Patch by Olivier Grisel.
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 3fc2596..663773f 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -280,7 +280,9 @@ def whichmodule(obj, name, allow_qualname=False): module_name = getattr(obj, '__module__', None) if module_name is not None: 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: continue try: |