From cf18bce4f179bb9a9038377afdfda24ac9e5db5b Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 3 Feb 2021 16:56:58 -0500 Subject: [PATCH] fix gc related race in weakdict popitem Change-Id: I88c19b6d3c97a714f7e4bf22812a23e095f9dcba --- lib/sqlalchemy/orm/mapper.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 16a2c64160..fe425301a0 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() -- 2.47.2