clean-ups after rebasing

Author: topper-123

pandas/core/indexes/base.py

@@ -2431,29 +2431,6 @@ def _is_multi(self) -> bool:
         """
         return isinstance(self, ABCMultiIndex)
 
-    @final
-    @classmethod
-    def _is_numeric_index(cls) -> bool:
-        """
-        Check if this is a NumericIndex, but *not* Int64Index, UInt64Index, FloatIndex.
-
-        Used to check if an operation should return NumericIndex or plain Index.
-        """
-        from pandas import (
-            Float64Index,
-            Int64Index,
-            NumericIndex,
-            RangeIndex,
-            UInt64Index,
-        )
-
-        if not issubclass(cls, NumericIndex):
-            return False
-        elif issubclass(cls, (RangeIndex, Int64Index, UInt64Index, Float64Index)):
-            return False
-        else:
-            return True
-
     # --------------------------------------------------------------------
     # Pickle Methods
 

pandas/core/indexes/numeric.py

@@ -228,8 +228,8 @@ def __contains__(self, key) -> bool:
 
     @doc(Index.astype)
     def astype(self, dtype, copy=True):
+        dtype = pandas_dtype(dtype)
         if is_float_dtype(self.dtype):
-            dtype = pandas_dtype(dtype)
             if needs_i8_conversion(dtype):
                 raise TypeError(
                     f"Cannot convert Float64Index to dtype {dtype}; integer "
@@ -243,6 +243,9 @@ def astype(self, dtype, copy=True):
                     return Int64Index(arr, name=self.name)
                 else:
                     return NumericIndex(arr, name=self.name, dtype=dtype)
+        elif self._is_numeric_index:
+            if not is_extension_array_dtype(dtype) and is_numeric_dtype(dtype):
+                return type(self)(self, dtype=dtype, copy=copy)
 
         return super().astype(dtype, copy=copy)
 
@@ -273,21 +276,6 @@ def _maybe_cast_slice_bound(self, label, side: str, kind=lib.no_default):
         # we will try to coerce to integers
         return self._maybe_cast_indexer(label)
 
-    @doc(Index._convert_arr_indexer)
-    def _convert_arr_indexer(self, keyarr) -> np.ndarray:
-        if not is_unsigned_integer_dtype(self.dtype):
-            return super()._convert_arr_indexer(keyarr)
-
-        # Cast the indexer to uint64 if possible so that the values returned
-        # from indexing are also uint64.
-        dtype = None
-        if is_integer_dtype(keyarr) or (
-            lib.infer_dtype(keyarr, skipna=False) == "integer"
-        ):
-            dtype = np.dtype(np.uint64)
-
-        return com.asarray_tuplesafe(keyarr, dtype=dtype)
-
     # ----------------------------------------------------------------
 
     @doc(Index._shallow_copy)