openstack/deb-python-sqlalchemy-utils
Code Issues Proposed changes

Fix issues with inheritance

Browse Source
This commit is contained in:
Konsta Vesterinen
2014-01-21 14:40:04 +02:00
parent 0e4a655098
commit 88d6cc9527
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sqlalchemy_utils/aggregates.py
View File

@@ -281,7 +281,7 @@ class AggregatedAttribute(declared_attr):
self.relationship = relationship self.relationship = relationship
def __get__(desc, self, cls): def __get__(desc, self, cls):
if not hasattr(cls, '__aggregates__'): if '__aggregates__' not in cls.__dict__:
cls.__aggregates__ = {} cls.__aggregates__ = {}
cls.__aggregates__[desc.fget.__name__] = { cls.__aggregates__[desc.fget.__name__] = {
'expression': desc.fget, 'expression': desc.fget,
@@ -413,7 +413,7 @@ class AggregationManager(object):
) )
def update_generator_registry(self, mapper, class_): def update_generator_registry(self, mapper, class_):
if hasattr(class_, '__aggregates__'): if '__aggregates__' in class_.__dict__:
for key, value in six.iteritems(class_.__aggregates__): for key, value in six.iteritems(class_.__aggregates__):
relationships = [] relationships = []
rel_class = class_ rel_class = class_