use Any

Author: twoertwein

pandas/_typing.py

@@ -141,10 +141,7 @@
 ]
 
 # For functions like rename that convert one label to another
-HashableT = TypeVar("HashableT", bound=Hashable)
-HashableTa = TypeVar("HashableTa", bound=Hashable)
-HashableTb = TypeVar("HashableTb", bound=Hashable)
-Renamer = Union[Mapping[HashableT, Hashable], Callable[[HashableT], Hashable]]
+Renamer = Union[Mapping[Any, Hashable], Callable[[Any], Hashable]]
 
 # to maintain type information across generic functions and parametrization
 T = TypeVar("T")

pandas/core/frame.py

@@ -58,9 +58,6 @@
     FloatFormatType,
     FormattersType,
     Frequency,
-    HashableT,
-    HashableTa,
-    HashableTb,
     IgnoreRaise,
     IndexKeyFunc,
     IndexLabel,
@@ -5036,10 +5033,10 @@ def drop(  # type: ignore[override]
     @overload
     def rename(
         self,
-        mapper: Renamer[HashableT] | None = ...,
+        mapper: Renamer | None = ...,
         *,
-        index: Renamer[HashableTa] | None = ...,
-        columns: Renamer[HashableTb] | None = ...,
+        index: Renamer | None = ...,
+        columns: Renamer | None = ...,
         axis: Axis | None = ...,
         copy: bool = ...,
         inplace: Literal[True],
@@ -5051,10 +5048,10 @@ def rename(
     @overload
     def rename(
         self,
-        mapper: Renamer[HashableT] | None = ...,
+        mapper: Renamer | None = ...,
         *,
-        index: Renamer[HashableTa] | None = ...,
-        columns: Renamer[HashableTb] | None = ...,
+        index: Renamer | None = ...,
+        columns: Renamer | None = ...,
         axis: Axis | None = ...,
         copy: bool = ...,
         inplace: Literal[False] = ...,
@@ -5066,10 +5063,10 @@ def rename(
     @overload
     def rename(
         self,
-        mapper: Renamer[HashableT] | None = ...,
+        mapper: Renamer | None = ...,
         *,
-        index: Renamer[HashableTa] | None = ...,
-        columns: Renamer[HashableTb] | None = ...,
+        index: Renamer | None = ...,
+        columns: Renamer | None = ...,
         axis: Axis | None = ...,
         copy: bool = ...,
         inplace: bool = ...,
@@ -5080,10 +5077,10 @@ def rename(
 
     def rename(
         self,
-        mapper: Renamer[HashableT] | None = None,
+        mapper: Renamer | None = None,
         *,
-        index: Renamer[HashableTa] | None = None,
-        columns: Renamer[HashableTb] | None = None,
+        index: Renamer | None = None,
+        columns: Renamer | None = None,
         axis: Axis | None = None,
         copy: bool = True,
         inplace: bool = False,

pandas/core/generic.py

@@ -44,9 +44,6 @@
     DtypeArg,
     DtypeObj,
     FilePath,
-    HashableT,
-    HashableTa,
-    HashableTb,
     IgnoreRaise,
     IndexKeyFunc,
     IndexLabel,
@@ -977,10 +974,10 @@ def squeeze(self, axis=None):
 
     def _rename(
         self: NDFrameT,
-        mapper: Renamer[HashableT] | None = None,
+        mapper: Renamer | None = None,
         *,
-        index: Renamer[HashableTa] | None = None,
-        columns: Renamer[HashableTb] | None = None,
+        index: Renamer | None = None,
+        columns: Renamer | None = None,
         axis: Axis | None = None,
         copy: bool_t = True,
         inplace: bool_t = False,
@@ -1113,19 +1110,9 @@ def _rename(
         else:
             # use the mapper argument
             if axis and self._get_axis_number(axis) == 1:
-                # error: Incompatible types in assignment (expression has type
-                # "Optional[Union[Mapping[HashableT, Hashable], Callable[
-                # [HashableT], Hashable]]]", variable has type "Optional[Union[
-                # Mapping[HashableTb, Hashable], Callable[[HashableTb], Hashable
-                # ]]]")
-                columns = mapper  # type: ignore[assignment]
+                columns = mapper
             else:
-                # error: Incompatible types in assignment (expression has type
-                # "Optional[Union[Mapping[HashableT, Hashable], Callable[[
-                # HashableT], Hashable]]]", variable has type "Optional[Union[
-                # Mapping[HashableTa, Hashable], Callable[[HashableTa], Hashable
-                # ]]]")
-                index = mapper  # type: ignore[assignment]
+                index = mapper
 
         self._check_inplace_and_allows_duplicate_labels(inplace)
         result = self if inplace else self.copy(deep=copy)

pandas/core/series.py

@@ -38,7 +38,6 @@
     Dtype,
     DtypeObj,
     FillnaOptions,
-    HashableT,
     IgnoreRaise,
     IndexKeyFunc,
     Level,
@@ -4622,7 +4621,7 @@ def align(
     @overload
     def rename(
         self,
-        index: Renamer[HashableT] | Hashable | None = ...,
+        index: Renamer | Hashable | None = ...,
         *,
         axis: Axis | None = ...,
         copy: bool = ...,
@@ -4635,7 +4634,7 @@ def rename(
     @overload
     def rename(
         self,
-        index: Renamer[HashableT] | Hashable | None = ...,
+        index: Renamer | Hashable | None = ...,
         *,
         axis: Axis | None = ...,
         copy: bool = ...,
@@ -4648,7 +4647,7 @@ def rename(
     @overload
     def rename(
         self,
-        index: Renamer[HashableT] | Hashable | None = ...,
+        index: Renamer | Hashable | None = ...,
         *,
         axis: Axis | None = ...,
         copy: bool = ...,
@@ -4660,7 +4659,7 @@ def rename(
 
     def rename(
         self,
-        index: Renamer[HashableT] | Hashable | None = None,
+        index: Renamer | Hashable | None = None,
         *,
         axis: Axis | None = None,
         copy: bool = True,

pandas/io/json/_normalize.py

@@ -522,8 +522,7 @@ def _recursive_extract(data, path, seen_meta, level=0):
     result = DataFrame(records)
 
     if record_prefix is not None:
-        rename_fun: Callable[[Hashable], str] = lambda x: f"{record_prefix}{x}"
-        result = result.rename(columns=rename_fun)
+        result = result.rename(columns=lambda x: f"{record_prefix}{x}")
 
     # Data types, a problem
     for k, v in meta_vals.items():