blender
/
blender
136
412
Fork 596
Code Issues 6.3k Pull Requests 769 Projects 19 Wiki Activity

Fix #121021: Avoid size change of addon_modules during iteration #121100

Merged
YimingWu merged 4 commits from fix-121021 into main 2024-05-11 08:58:32 +02:00
Conversation 6 Commits 4 Files Changed 1 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/modules/addon_utils.py
View File

@ -584,8 +584,9 @@ def disable_all():
#
# Either way, running 3rd party logic here can cause undefined behavior.
# Use direct `__dict__` access to bypass `__getattr__`, see: #111649.
modules = sys.modules.copy()
addon_modules = [
item for item in sys.modules.items()
item for item in modules.items()
ChengduLittleA marked this conversation as resolved Outdated
Sybren A. Stüvel commented 2024-05-10 11:05:00 +02:00
Outdated
Review
Copy Link

This should still call .items(), otherwise it'll be iterating over the dictionary keys instead.

This should still call `.items()`, otherwise it'll be iterating over the dictionary keys instead.
if type(mod_dict := getattr(item[1], "__dict__", None)) is dict
if mod_dict.get("__addon_enabled__")
]