From b2703713490b05382958e856b56c6da46f655c15 Mon Sep 17 00:00:00 2001 From: lofoyet Date: Thu, 24 Jan 2019 22:29:00 -0500 Subject: [PATCH] if df name is not hashable then use None in agg --- pandas/core/base.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandas/core/base.py b/pandas/core/base.py index c02ba88ea7fda..f306c9d9c3744 100644 --- a/pandas/core/base.py +++ b/pandas/core/base.py @@ -16,8 +16,8 @@ from pandas.core.dtypes.common import ( is_datetime64_ns_dtype, is_datetime64tz_dtype, is_datetimelike, - is_extension_array_dtype, is_extension_type, is_list_like, is_object_dtype, - is_scalar, is_timedelta64_ns_dtype) + is_extension_array_dtype, is_extension_type, is_hashable, is_list_like, + is_object_dtype, is_scalar, is_timedelta64_ns_dtype) from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries from pandas.core.dtypes.missing import isna @@ -546,10 +546,10 @@ def is_any_frame(): try: result = DataFrame(result) except ValueError: - + name_attr = getattr(self, 'name', None) + name_attr = name_attr if is_hashable(name_attr) else None # we have a dict of scalars - result = Series(result, - name=getattr(self, 'name', None)) + result = Series(result, name=name_attr) return result, True elif is_list_like(arg) and arg not in compat.string_types: