diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-09-14 17:46:54 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-09-14 17:46:54 -0400 |
| commit | 9d7158a2c3869ad7a1ab07d3a41e831f6806a68c (patch) | |
| tree | 2464edb66a6bea6fa5a2956dbcd179772c999de6 /lib/sqlalchemy/orm/dynamic.py | |
| parent | 904466a29320844ccc164bad4699198d3916159d (diff) | |
| parent | 46196ea723484f354ac17204ccd489004baaac95 (diff) | |
| download | sqlalchemy-9d7158a2c3869ad7a1ab07d3a41e831f6806a68c.tar.gz | |
merge tip
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 d2063dbc6..cc8ff2abc 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) |