From 50bcba3be1c7d4bc647afb9b682471ef651a0479 Mon Sep 17 00:00:00 2001 From: Konsta Vesterinen Date: Mon, 11 Nov 2013 10:21:16 +0200 Subject: [PATCH] Some minor naming changes --- sqlalchemy_utils/aggregates.py | 7 ++++--- tests/aggregate/test_custom_select_expressions.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sqlalchemy_utils/aggregates.py b/sqlalchemy_utils/aggregates.py index 36f1563..1e033be 100644 --- a/sqlalchemy_utils/aggregates.py +++ b/sqlalchemy_utils/aggregates.py @@ -258,6 +258,7 @@ Multi-level aggregates TODO ---- +* Support calculation of many-to-many aggregates * Special consideration should be given to `deadlocks`_. @@ -281,10 +282,10 @@ class AggregatedAttribute(declared_attr): fget, relationship, expr, - *arg, - **kw + *args, + **kwargs ): - super(AggregatedAttribute, self).__init__(fget, *arg, **kw) + super(AggregatedAttribute, self).__init__(fget, *args, **kwargs) self.__doc__ = fget.__doc__ self.expr = expr self.relationship = relationship diff --git a/tests/aggregate/test_custom_select_expressions.py b/tests/aggregate/test_custom_select_expressions.py index 7a166a0..650b45e 100644 --- a/tests/aggregate/test_custom_select_expressions.py +++ b/tests/aggregate/test_custom_select_expressions.py @@ -34,7 +34,7 @@ class TestLazyEvaluatedSelectExpressionsForAggregates(TestCase): self.Catalog = Catalog self.Product = Product - def test_assigns_aggregates_insert(self): + def test_assigns_aggregates_on_insert(self): catalog = self.Catalog( name=u'Some catalog' )