Skip to content

Commit 97e1080

Browse files
committed
revert equals to previous
1 parent c299b45 commit 97e1080

File tree

2 files changed

+7
-22
lines changed

2 files changed

+7
-22
lines changed

pandas/indexes/multi.py

+6-8
Original file line numberDiff line numberDiff line change
@@ -2216,16 +2216,14 @@ def equals(self, other):
22162216
if self.is_(other):
22172217
return True
22182218

2219-
if not isinstance(other, MultiIndex):
2220-
if isinstance(other, tuple):
2221-
other = [other]
2222-
if not is_list_like(other):
2219+
if not isinstance(other, Index):
2220+
if not isinstance(other, tuple):
22232221
return False
2222+
other = Index([other])
22242223

2225-
try:
2226-
other = MultiIndex.from_tuples(other)
2227-
except:
2228-
return False
2224+
if not isinstance(other, MultiIndex):
2225+
return array_equivalent(self._values,
2226+
_values_from_object(_ensure_index(other)))
22292227

22302228
if self.nlevels != other.nlevels:
22312229
return False

pandas/tests/indexes/test_multi.py

+1-14
Original file line numberDiff line numberDiff line change
@@ -1447,22 +1447,9 @@ def test_to_hierarchical(self):
14471447
def test_bounds(self):
14481448
self.index._bounds
14491449

1450-
def test_equals(self):
1451-
1452-
for name, idx in compat.iteritems(self.indices):
1453-
self.assertTrue(idx.equals(idx))
1454-
self.assertTrue(idx.equals(idx.copy()))
1455-
self.assertTrue(idx.equals(idx.astype(object)))
1456-
self.assertTrue(idx.equals(list(idx)))
1457-
self.assertTrue(idx.equals(np.array(idx)))
1458-
1459-
same_values = Index(idx, dtype=object)
1460-
self.assertTrue(idx.equals(same_values))
1461-
self.assertTrue(same_values.equals(idx))
1462-
14631450
def test_equals_multi(self):
14641451
assert self.index.equals(self.index)
1465-
assert self.index.equals(self.index.values)
1452+
assert not self.index.equals(self.index.values)
14661453
assert self.index.equals(Index(self.index.values))
14671454

14681455
assert self.index.equal_levels(self.index)

0 commit comments

Comments
 (0)