Merge pull request #637 from nbedi/any-bool

Only overwrite agate.Any test if test is None. Closes #636
wireservice · Oct 30, 2016 · 97cb37f · 97cb37f
2 parents 0d26713 + 3d795e0
commit 97cb37f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/agate/aggregations/any.py b/agate/aggregations/any.py
@@ -32,7 +32,7 @@ def run(self, table):
         column = table.columns[self._column_name]
         data = column.values()
 
-        if isinstance(column.data_type, Boolean):
+        if isinstance(column.data_type, Boolean) and self._test is None:
             return any(data)
 
         return any(self._test(d) for d in data)
diff --git a/tests/test_aggregations.py b/tests/test_aggregations.py
@@ -138,6 +138,7 @@ def test_any(self):
         table = Table(rows, ['test'], [Boolean()])
         Any('test').validate(table)
         self.assertEqual(Any('test').run(table), False)
+        self.assertEqual(Any('test', lambda r: not r).run(table), True)
 
     def test_all(self):
         rows = [