- Fixed a potential KeyError which under some

    circumstances could occur with the identity
    map, part of [ticket:2148]

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/sqlalchemy/orm/identity.py b/lib/sqlalchemy/orm/identity.py
index a53d9f52d..8f000e419 100644
--- a/lib/sqlalchemy/orm/identity.py
+++ b/lib/sqlalchemy/orm/identity.py
@@ -138,9 +138,9 @@ class WeakInstanceDict(IdentityMap):
         self._manage_incoming_state(state)
 
     def get(self, key, default=None):
-        if not dict.__contains__(self, key):
+        state = dict.get(self, key, default)
+        if state is default:
             return default
-        state = dict.__getitem__(self, key)
         o = state.obj()
         if o is None:
             o = state._is_really_none()