diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-09-14 17:37:27 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-09-14 17:37:27 -0400 |
| commit | 60b82d6e13246a3d88e7288e863a5231b7572c6a (patch) | |
| tree | 30fb5710dd763fd4fbfa9966efe47a4c9e7eace9 /lib/sqlalchemy/orm/dynamic.py | |
| parent | b6fe3a83e9127996cb903ae176701ddfbcca5b12 (diff) | |
| parent | 46196ea723484f354ac17204ccd489004baaac95 (diff) | |
| download | sqlalchemy-60b82d6e13246a3d88e7288e863a5231b7572c6a.tar.gz | |
- merge tip, 0.6.4 + 0.6.5
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 918a0aabd..2b0883cfb 100644 --- a/lib/sqlalchemy/orm/dynamic.py +++ b/lib/sqlalchemy/orm/dynamic.py @@ -113,7 +113,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) |