diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-08-08 15:14:27 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-08-08 15:14:27 -0400 |
| commit | bb3be98d3bee4b2bcef791be022ddb2510b9cf9c (patch) | |
| tree | 02226772e5927f739cbf5a1ce7996745eb3fd17e /lib/sqlalchemy/orm/interfaces.py | |
| parent | c71513ce42d9a5efc621e39e858169ad069e009b (diff) | |
| download | sqlalchemy-bb3be98d3bee4b2bcef791be022ddb2510b9cf9c.tar.gz | |
- some of the refinements from the sa_synonyms branch which will
allow the hybrid extension to work, but doesn't re-implement synonym,
comparable_property,concreteinheritedproperty
- mapper.get_property() and _entity_descriptor use plain getattr()
to get at descriptors in all cases, thereby placing more
trust in the ultimate class-bound attribute to provide mapped
properties
Diffstat (limited to 'lib/sqlalchemy/orm/interfaces.py')
| -rw-r--r-- | lib/sqlalchemy/orm/interfaces.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py index 91c2ae403..9874e644f 100644 --- a/lib/sqlalchemy/orm/interfaces.py +++ b/lib/sqlalchemy/orm/interfaces.py @@ -474,7 +474,7 @@ class MapperProperty(object): return iter(()) - def set_parent(self, parent): + def set_parent(self, parent, init): self.parent = parent def instrument_class(self, mapper): |