more fixes

Author: jreback

pandas/indexes/multi.py

@@ -2216,14 +2216,16 @@ def equals(self, other):
         if self.is_(other):
             return True
 
-        if not isinstance(other, Index):
-            if not isinstance(other, tuple):
+        if not isinstance(other, MultiIndex):
+            if isinstance(other, tuple):
+                other = [other]
+            if not is_list_like(other):
                 return False
-            other = Index([other])
 
-        if not isinstance(other, MultiIndex):
-            return array_equivalent(self._values,
-                                    _values_from_object(_ensure_index(other)))
+            try:
+                other = MultiIndex.from_tuples(other)
+            except:
+                return False
 
         if self.nlevels != other.nlevels:
             return False

pandas/tests/indexes/test_multi.py

@@ -1447,20 +1447,36 @@ def test_to_hierarchical(self):
     def test_bounds(self):
         self.index._bounds
 
+    def test_equals(self):
+
+        for name, idx in compat.iteritems(self.indices):
+            self.assertTrue(idx.equals(idx))
+            self.assertTrue(idx.equals(idx.copy()))
+            self.assertTrue(idx.equals(idx.astype(object)))
+            self.assertTrue(idx.equals(list(idx)))
+            self.assertTrue(idx.equals(np.array(idx)))
+
+            same_values = Index(idx, dtype=object)
+            self.assertTrue(idx.equals(same_values))
+            self.assertTrue(same_values.equals(idx))
+
     def test_equals_multi(self):
-        self.assertTrue(self.index.equals(self.index))
-        self.assertTrue(self.index.equal_levels(self.index))
+        assert self.index.equals(self.index)
+        assert self.index.equals(self.index.values)
+        assert self.index.equals(Index(self.index.values))
 
-        self.assertFalse(self.index.equals(self.index[:-1]))
+        assert self.index.equal_levels(self.index)
+        assert not self.index.equals(self.index[:-1])
+        assert not self.index.equals(self.index[-1])
 
         # different number of levels
         index = MultiIndex(levels=[Index(lrange(4)), Index(lrange(4)), Index(
             lrange(4))], labels=[np.array([0, 0, 1, 2, 2, 2, 3, 3]), np.array(
                 [0, 1, 0, 0, 0, 1, 0, 1]), np.array([1, 0, 1, 1, 0, 0, 1, 0])])
 
         index2 = MultiIndex(levels=index.levels[:-1], labels=index.labels[:-1])
-        self.assertFalse(index.equals(index2))
-        self.assertFalse(index.equal_levels(index2))
+        assert not index.equals(index2)
+        assert not index.equal_levels(index2)
 
         # levels are different
         major_axis = Index(lrange(4))
@@ -1471,8 +1487,8 @@ def test_equals_multi(self):
 
         index = MultiIndex(levels=[major_axis, minor_axis],
                            labels=[major_labels, minor_labels])
-        self.assertFalse(self.index.equals(index))
-        self.assertFalse(self.index.equal_levels(index))
+        assert not self.index.equals(index)
+        assert not self.index.equal_levels(index)
 
         # some of the labels are different
         major_axis = Index(['foo', 'bar', 'baz', 'qux'])
@@ -1483,7 +1499,7 @@ def test_equals_multi(self):
 
         index = MultiIndex(levels=[major_axis, minor_axis],
                            labels=[major_labels, minor_labels])
-        self.assertFalse(self.index.equals(index))
+        assert not self.index.equals(index)
 
     def test_equals_missing_values(self):
         # make sure take is not using -1