diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-09-13 02:09:38 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-09-13 02:09:38 -0400 |
commit | f5d2bb60a886ba0aa35a04eb6c096b7982643ca2 (patch) | |
tree | cf4cbf51686d0006baa26fc7a8add6c72517790b /lib/sqlalchemy/orm/dynamic.py | |
parent | 18f6a06a51943198a9a375c781c2dbc1511d24a5 (diff) | |
download | sqlalchemy-f5d2bb60a886ba0aa35a04eb6c096b7982643ca2.tar.gz |
- Fixed recursion bug which could occur when moving
an object from one reference to another, with
backrefs involved, where the initiating parent
was a subclass (with its own mapper) of the
previous parent.
Diffstat (limited to 'lib/sqlalchemy/orm/dynamic.py')
-rw-r--r-- | lib/sqlalchemy/orm/dynamic.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/dynamic.py b/lib/sqlalchemy/orm/dynamic.py index d55838011..c5ddaca40 100644 --- a/lib/sqlalchemy/orm/dynamic.py +++ b/lib/sqlalchemy/orm/dynamic.py @@ -112,7 +112,7 @@ class DynamicAttributeImpl(attributes.AttributeImpl): def set(self, state, dict_, value, initiator, passive=attributes.PASSIVE_OFF): - if initiator is self: + if initiator and initiator.parent_token is self.parent_token: return self._set_iterable(state, dict_, value) |