diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-08-31 21:59:45 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-08-31 21:59:45 +0000 |
| commit | fed57bc9dd48fc08bbb845cf434d22770b58a9a1 (patch) | |
| tree | 6d20bff98a6540feb801303a71180f211479b93c /lib/sqlalchemy/orm/identity.py | |
| parent | 2cb92cbbd0dda5646c98ddb29592064221740753 (diff) | |
| download | sqlalchemy-fed57bc9dd48fc08bbb845cf434d22770b58a9a1.tar.gz | |
doh
Diffstat (limited to 'lib/sqlalchemy/orm/identity.py')
| -rw-r--r-- | lib/sqlalchemy/orm/identity.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/identity.py b/lib/sqlalchemy/orm/identity.py index d0d0a7962..c668bc5fe 100644 --- a/lib/sqlalchemy/orm/identity.py +++ b/lib/sqlalchemy/orm/identity.py @@ -211,7 +211,7 @@ class StrongInstanceDict(IdentityMap): def add(self, state): if state.key in self: - if dict.__getitem__(self, state.key) is not state: + if attributes.instance_state(dict.__getitem__(self, state.key)) is not state: raise AssertionError("A conflicting state is already present in the identity map for key %r" % (state.key, )) else: dict.__setitem__(self, state.key, state.obj()) |