Skip to content

Commit 75ef96f

Browse files
committed
BUG: raise on non-hashable Index name, closes pandas-dev#29069
1 parent 18bd98f commit 75ef96f

File tree

10 files changed

+46
-19
lines changed

10 files changed

+46
-19
lines changed

pandas/core/indexes/base.py

+15-2
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,7 @@ def __new__(
274274
from .interval import IntervalIndex
275275
from .category import CategoricalIndex
276276

277-
if name is None and hasattr(data, "name"):
278-
name = data.name
277+
name = maybe_extract_name(name, data)
279278

280279
if isinstance(data, ABCPandasArray):
281280
# ensure users don't accidentally put a PandasArray in an index.
@@ -5464,3 +5463,17 @@ def default_index(n):
54645463
from pandas.core.indexes.range import RangeIndex
54655464

54665465
return RangeIndex(0, n, name=None)
5466+
5467+
5468+
def maybe_extract_name(name, obj):
5469+
"""
5470+
If no name is passed, then extract it from data, validating hashability.
5471+
"""
5472+
if name is None and hasattr(obj, "name"):
5473+
name = obj.name
5474+
5475+
# GH#29069
5476+
if not is_hashable(name):
5477+
raise TypeError(f"Index.name must be a hashable type")
5478+
5479+
return name

pandas/core/indexes/category.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from pandas.core.base import _shared_docs
3030
import pandas.core.common as com
3131
import pandas.core.indexes.base as ibase
32-
from pandas.core.indexes.base import Index, _index_shared_docs
32+
from pandas.core.indexes.base import Index, _index_shared_docs, maybe_extract_name
3333
import pandas.core.missing as missing
3434
from pandas.core.ops import get_op_result_name
3535

@@ -175,8 +175,7 @@ def __new__(
175175

176176
dtype = CategoricalDtype._from_values_or_dtype(data, categories, ordered, dtype)
177177

178-
if name is None and hasattr(data, "name"):
179-
name = data.name
178+
name = maybe_extract_name(name, data)
180179

181180
if not is_categorical_dtype(data):
182181
# don't allow scalars

pandas/core/indexes/datetimes.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
)
3131
from pandas.core.base import _shared_docs
3232
import pandas.core.common as com
33-
from pandas.core.indexes.base import Index
33+
from pandas.core.indexes.base import Index, maybe_extract_name
3434
from pandas.core.indexes.datetimelike import (
3535
DatetimeIndexOpsMixin,
3636
DatetimelikeDelegateMixin,
@@ -253,8 +253,7 @@ def __new__(
253253

254254
# - Cases checked above all return/raise before reaching here - #
255255

256-
if name is None and hasattr(data, "name"):
257-
name = data.name
256+
name = maybe_extract_name(name, data)
258257

259258
dtarr = DatetimeArray._from_sequence(
260259
data,

pandas/core/indexes/interval.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
_index_shared_docs,
4848
default_pprint,
4949
ensure_index,
50+
maybe_extract_name,
5051
)
5152
from pandas.core.indexes.datetimes import DatetimeIndex, date_range
5253
from pandas.core.indexes.multi import MultiIndex
@@ -213,8 +214,7 @@ def __new__(
213214
cls, data, closed=None, dtype=None, copy=False, name=None, verify_integrity=True
214215
):
215216

216-
if name is None and hasattr(data, "name"):
217-
name = data.name
217+
name = maybe_extract_name(name, data)
218218

219219
with rewrite_exception("IntervalArray", cls.__name__):
220220
array = IntervalArray(

pandas/core/indexes/numeric.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@
3030
from pandas._typing import Dtype
3131
from pandas.core import algorithms
3232
import pandas.core.common as com
33-
from pandas.core.indexes.base import Index, InvalidIndexError, _index_shared_docs
33+
from pandas.core.indexes.base import (
34+
Index,
35+
InvalidIndexError,
36+
_index_shared_docs,
37+
maybe_extract_name,
38+
)
3439
from pandas.core.ops import get_op_result_name
3540

3641
_num_index_shared_docs = dict()
@@ -68,8 +73,7 @@ def __new__(cls, data=None, dtype=None, copy=False, name=None):
6873
else:
6974
subarr = data
7075

71-
if name is None and hasattr(data, "name"):
72-
name = data.name
76+
name = maybe_extract_name(name, data)
7377
return cls._simple_new(subarr, name=name)
7478

7579
@classmethod

pandas/core/indexes/period.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
from pandas.core.base import _shared_docs
2626
import pandas.core.common as com
2727
import pandas.core.indexes.base as ibase
28-
from pandas.core.indexes.base import _index_shared_docs, ensure_index
28+
from pandas.core.indexes.base import (
29+
_index_shared_docs,
30+
ensure_index,
31+
maybe_extract_name,
32+
)
2933
from pandas.core.indexes.datetimelike import (
3034
DatetimeIndexOpsMixin,
3135
DatetimelikeDelegateMixin,
@@ -184,8 +188,7 @@ def __new__(
184188
argument = list(set(fields) - valid_field_set)[0]
185189
raise TypeError(f"__new__() got an unexpected keyword argument {argument}")
186190

187-
if name is None and hasattr(data, "name"):
188-
name = data.name
191+
name = maybe_extract_name(name, data)
189192

190193
if data is None and ordinal is None:
191194
# range-based.

pandas/core/indexes/range.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import pandas.core.common as com
2727
from pandas.core.construction import extract_array
2828
import pandas.core.indexes.base as ibase
29-
from pandas.core.indexes.base import Index, _index_shared_docs
29+
from pandas.core.indexes.base import Index, _index_shared_docs, maybe_extract_name
3030
from pandas.core.indexes.numeric import Int64Index
3131
from pandas.core.ops.common import unpack_zerodim_and_defer
3232

@@ -85,10 +85,10 @@ def __new__(
8585
):
8686

8787
cls._validate_dtype(dtype)
88+
name = maybe_extract_name(name, start)
8889

8990
# RangeIndex
9091
if isinstance(start, RangeIndex):
91-
name = start.name if name is None else name
9292
start = start._range
9393
return cls._simple_new(start, dtype=dtype, name=name)
9494

pandas/core/indexes/timedeltas.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from pandas.core.arrays.timedeltas import TimedeltaArray, _is_convertible_to_td
2626
from pandas.core.base import _shared_docs
2727
import pandas.core.common as com
28-
from pandas.core.indexes.base import Index, _index_shared_docs
28+
from pandas.core.indexes.base import Index, _index_shared_docs, maybe_extract_name
2929
from pandas.core.indexes.datetimelike import (
3030
DatetimeIndexOpsMixin,
3131
DatetimelikeDelegateMixin,
@@ -163,6 +163,7 @@ def __new__(
163163
copy=False,
164164
name=None,
165165
):
166+
name = maybe_extract_name(name, data)
166167

167168
if is_scalar(data):
168169
raise TypeError(

pandas/tests/indexes/common.py

+7
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,13 @@ def test_shift(self):
103103
with pytest.raises(NotImplementedError, match=msg):
104104
idx.shift(1, 2)
105105

106+
def test_constructor_name_unhashable(self):
107+
# GH#29069 check that name is hashable
108+
# See also same-named test in tests.series.test_constructors
109+
idx = self.create_index()
110+
with pytest.raises(TypeError, match="Index.name must be a hashable type"):
111+
type(idx)(idx, name=[])
112+
106113
def test_create_index_existing_name(self):
107114

108115
# GH11193, when an existing index is passed, and a new name is not

pandas/tests/indexes/test_base.py

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ def test_constructor_copy(self, index):
100100
arr[0] = "SOMEBIGLONGSTRING"
101101
assert new_index[0] != "SOMEBIGLONGSTRING"
102102

103+
# FIXME: dont leave commented-out
103104
# what to do here?
104105
# arr = np.array(5.)
105106
# pytest.raises(Exception, arr.view, Index)

0 commit comments

Comments
 (0)