From f5d2bb60a886ba0aa35a04eb6c096b7982643ca2 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 13 Sep 2010 02:09:38 -0400
Subject: - 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.

---
 lib/sqlalchemy/orm/dynamic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/sqlalchemy/orm/dynamic.py')

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)
-- 
cgit v1.2.1