diff options
Diffstat (limited to 'lib/sqlalchemy')
| -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() |