Skip to content

Commit 09a1ae5

Browse files
committed
Still say MultiIndex in some cases
1 parent 4c0c893 commit 09a1ae5

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

pandas/_testing/asserters.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,10 @@ def _check_types(left, right, obj: str = "Index") -> None:
281281
# MultiIndex special comparison for little-friendly error messages
282282
if isinstance(left, MultiIndex):
283283
right = cast(MultiIndex, right)
284+
root_obj = "MultiIndex" if obj == "Index" else obj
284285

285286
for level in range(left.nlevels):
286-
lobj = f"{obj} level [{level}]"
287+
lobj = f"{root_obj} level [{level}]"
287288
try:
288289
# try comparison on levels/codes to avoid densifying MultiIndex
289290
assert_index_equal(

pandas/tests/util/test_assert_index_equal.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ def test_index_equal_levels_mismatch():
3232

3333

3434
def test_index_equal_values_mismatch(check_exact):
35-
msg = """Index level \\[1\\] are different
35+
msg = """MultiIndex level \\[1\\] are different
3636
37-
Index level \\[1\\] values are different \\(25\\.0 %\\)
37+
MultiIndex level \\[1\\] values are different \\(25\\.0 %\\)
3838
\\[left\\]: Index\\(\\[2, 2, 3, 4\\], dtype='int64'\\)
3939
\\[right\\]: Index\\(\\[1, 2, 3, 4\\], dtype='int64'\\)"""
4040

@@ -172,9 +172,9 @@ def test_index_equal_level_values_mismatch(check_exact, rtol):
172172
idx2 = MultiIndex.from_tuples([("A", 1), ("A", 2), ("B", 3), ("B", 4)])
173173
kwargs = {"check_exact": check_exact, "rtol": rtol}
174174

175-
msg = """Index level \\[1\\] are different
175+
msg = """MultiIndex level \\[1\\] are different
176176
177-
Index level \\[1\\] values are different \\(25\\.0 %\\)
177+
MultiIndex level \\[1\\] values are different \\(25\\.0 %\\)
178178
\\[left\\]: Index\\(\\[2, 2, 3, 4\\], dtype='int64'\\)
179179
\\[right\\]: Index\\(\\[1, 2, 3, 4\\], dtype='int64'\\)"""
180180

@@ -311,7 +311,9 @@ def test_assert_multi_index_dtype_check_categorical(check_categorical):
311311
idx1 = MultiIndex.from_arrays([Categorical(np.array([1, 2], dtype=np.uint64))])
312312
idx2 = MultiIndex.from_arrays([Categorical(np.array([1, 2], dtype=np.int64))])
313313
if check_categorical:
314-
with pytest.raises(AssertionError, match=r"^Index level \[0\] are different"):
314+
with pytest.raises(
315+
AssertionError, match=r"^MultiIndex level \[0\] are different"
316+
):
315317
tm.assert_index_equal(idx1, idx2, check_categorical=check_categorical)
316318
else:
317319
tm.assert_index_equal(idx1, idx2, check_categorical=check_categorical)

0 commit comments

Comments
 (0)