diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-02-03 16:56:58 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-02-03 16:56:58 -0500 |
| commit | cf18bce4f179bb9a9038377afdfda24ac9e5db5b (patch) | |
| tree | 123a4092ad34217154d657241da1670c29971a19 /lib/sqlalchemy/orm/mapper.py | |
| parent | 8fc36f3b56e574d7019de55b4c3b86aeec81472f (diff) | |
| download | sqlalchemy-cf18bce4f179bb9a9038377afdfda24ac9e5db5b.tar.gz | |
fix gc related race in weakdict popitem
Change-Id: I88c19b6d3c97a714f7e4bf22812a23e095f9dcba
Diffstat (limited to 'lib/sqlalchemy/orm/mapper.py')
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 16a2c6416..fe425301a 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -3450,8 +3450,13 @@ def _dispose_registries(registries, cascade): ) while reg._managers: - manager, _ = reg._managers.popitem() - reg._dispose_manager_and_mapper(manager) + try: + manager, _ = reg._managers.popitem() + except KeyError: + # guard against race between while and popitem + pass + else: + reg._dispose_manager_and_mapper(manager) reg._non_primary_mappers.clear() reg._dependents.clear() |