diff options
Diffstat (limited to 'lib/sqlalchemy/orm/descriptor_props.py')
| -rw-r--r-- | lib/sqlalchemy/orm/descriptor_props.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py index 37517e84c..0891a2a9d 100644 --- a/lib/sqlalchemy/orm/descriptor_props.py +++ b/lib/sqlalchemy/orm/descriptor_props.py @@ -11,13 +11,18 @@ as actively in the load/persist ORM loop. """ -from .interfaces import MapperProperty, PropComparator -from .util import _none_set from . import attributes -from .. import util, sql, exc as sa_exc, event, schema -from ..sql import expression from . import properties from . import query +from .interfaces import MapperProperty +from .interfaces import PropComparator +from .util import _none_set +from .. import event +from .. import exc as sa_exc +from .. import schema +from .. import sql +from .. import util +from ..sql import expression class DescriptorProperty(MapperProperty): @@ -366,10 +371,10 @@ class CompositeProperty(DescriptorProperty): return self.comparator_factory(self, mapper) class CompositeBundle(query.Bundle): - def __init__(self, property, expr): - self.property = property + def __init__(self, property_, expr): + self.property = property_ super(CompositeProperty.CompositeBundle, self).__init__( - property.key, *expr + property_.key, *expr ) def create_row_processor(self, query, procs, labels): |