test and import fixes

Author: iamlemec

pandas/core/reshape/concat.py

@@ -24,9 +24,9 @@
     all_indexes_same,
     ensure_index,
     get_objs_combined_axis,
+    get_unanimous_names,
 )
 import pandas.core.indexes.base as ibase
-from pandas.core.indexes.base import get_unanimous_names
 from pandas.core.internals import concatenate_block_managers
 
 if TYPE_CHECKING:

pandas/tests/indexes/datetimes/test_setops.py

@@ -471,9 +471,9 @@ def test_intersection_bug(self):
     def test_intersection_list(self):
         # GH#35876
         values = [pd.Timestamp("2020-01-01"), pd.Timestamp("2020-02-01")]
-        idx = pd.DatetimeIndex(values)
+        idx = pd.DatetimeIndex(values, name="a")
         res = idx.intersection(values)
-        tm.assert_index_equal(res, idx)
+        tm.assert_index_equal(res, idx.rename(None))
 
     def test_month_range_union_tz_pytz(self, sort):
         from pytz import timezone

pandas/tests/indexes/multi/test_join.py

@@ -46,7 +46,7 @@ def test_join_level_corner_case(idx):
 
 def test_join_self(idx, join_type):
     joined = idx.join(idx, how=join_type)
-    assert tm.equalContents(joined, idx)
+    tm.assert_index_equal(joined, idx)
 
 
 def test_join_multi():

pandas/tests/indexes/multi/test_setops.py

@@ -278,7 +278,7 @@ def test_intersection(idx, sort):
 
     # corner case, pass self
     the_int = idx.intersection(idx, sort=sort)
-    assert tm.equalContents(the_int, idx)
+    tm.assert_index_equal(the_int, idx)
 
     # empty intersection: disjoint
     empty = idx[:2].intersection(idx[2:], sort=sort)