Python3 dask aggregate fixes

holoviz · Nov 8, 2016 · 9c80879 · 9c80879
1 parent dbae3e6
commit 9c80879
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/holoviews/core/data/dask.py b/holoviews/core/data/dask.py
@@ -169,14 +169,14 @@ def aggregate(cls, columns, dimensions, function, **kwargs):
                     'std': 'std', 'sum': 'sum', 'var': 'var'}
         if len(dimensions):
             groups = reindexed.groupby(cols, sort=False)
-            if (hasattr(function, 'func_name') and function.func_name in inbuilts):
-                agg = getattr(groups, inbuilts[function.func_name])()
+            if (function.__name__ in inbuilts):
+                agg = getattr(groups, inbuilts[function.__name__])()
             else:
-                agg = groups.apply(function, axis=1)
+                agg = groups.apply(function)
             return agg.reset_index()
         else:
-            if (hasattr(function, 'func_name') and function.func_name in inbuilts):
-                agg = getattr(reindexed, inbuilts[function.func_name])()
+            if (function.__name__ in inbuilts):
+                agg = getattr(reindexed, inbuilts[function.__name__])()
             else:
                 raise NotImplementedError
             return pd.DataFrame(agg.compute()).T