Fix issues from merge

Author: nateyoder

Diff for: pandas/core/base.py

@@ -12,7 +12,8 @@
     is_object_dtype,
     is_list_like,
     is_scalar,
-    is_datetimelike)
+    is_datetimelike,
+    is_extension_type)
 
 from pandas.util._validators import validate_bool_kwarg
 
@@ -854,7 +855,7 @@ def _map_values(self, values, arg, na_action=None):
 
         Returns
         -------
-        applied : {Index, MultiIndex}, inferred
+        applied : Union[Index, MultiIndex], inferred
             The output of the mapping function applied to the index.
             If the function returns a tuple with more than one element
             a MultiIndex will be returned.
@@ -868,7 +869,7 @@ def _map_values(self, values, arg, na_action=None):
             if na_action == 'ignore':
                 def map_f(values, f):
                     return lib.map_infer_mask(values, f,
-                                              isnull(values).view(np.uint8))
+                                              isna(values).view(np.uint8))
             else:
                 map_f = lib.map_infer
 

Diff for: pandas/core/indexes/base.py

@@ -2892,7 +2892,7 @@ def map(self, arg, na_action=None):
 
         Returns
         -------
-        applied : {Index, MultiIndex}, inferred
+        applied : Union[Index, MultiIndex], inferred
             The output of the mapping function applied to the index.
             If the function returns a tuple with more than one element
             a MultiIndex will be returned.
@@ -2914,7 +2914,7 @@ def map(self, arg, na_action=None):
                                           names=names)
 
         attributes['copy'] = False
-        return Index(new_values, **attributes)
+        return self._constructor(new_values, **attributes)
 
     def isin(self, values, level=None):
         """

Diff for: pandas/tests/indexes/test_base.py

@@ -842,6 +842,9 @@ def test_map_with_dict_and_series(self):
             if name == 'catIndex':
                 # Tested in test_categorical
                 continue
+            elif name == 'repeats':
+                # Cannot map duplicated index
+                continue
 
             cur_index = self.indices[name]
             expected = Index(np.arange(len(cur_index), 0, -1))