update transpose and fillna to use consistent typing

pandas/_typing.py

@@ -112,6 +112,7 @@
 FrameOrSeries = TypeVar("FrameOrSeries", bound="NDFrame")
 
 Axis = Union[str, int]
+NumpyAxis = Union[Tuple[int], List[int], None]
 IndexLabel = Union[Hashable, Sequence[Hashable]]
 Level = Union[Hashable, int]
 Shape = Tuple[int, ...]

pandas/core/arrays/base.py

@@ -25,6 +25,7 @@
 from pandas._typing import (
     ArrayLike,
     Dtype,
+    NumpyAxis,
     PositionalIndexer,
     Shape,
 )
@@ -1214,7 +1215,7 @@ def _formatter(self, boxed: bool = False) -> Callable[[Any], str | None]:
     # Reshaping
     # ------------------------------------------------------------------------
 
-    def transpose(self, *axes: tuple[int] | list[int] | None) -> ExtensionArray:
+    def transpose(self, axes: NumpyAxis = None) -> ExtensionArray:
         """
         Return a transposed view on this array.
 

pandas/core/base.py

@@ -19,6 +19,7 @@
     Dtype,
     DtypeObj,
     IndexLabel,
+    NumpyAxis,
     Shape,
     final,
 )
@@ -298,15 +299,15 @@ def _values(self) -> ExtensionArray | np.ndarray:
         # must be defined here as a property for mypy
         raise AbstractMethodError(self)
 
-    def transpose(self: _T, *args, **kwargs) -> _T:
+    def transpose(self: _T, axes: NumpyAxis = None) -> _T:
         """
         Return the transpose, which is by definition self.
 
         Returns
         -------
         %(klass)s
         """
-        nv.validate_transpose(args, kwargs)
+        nv.validate_transpose(axes, {})
         return self
 
     T = property(

pandas/core/frame.py

@@ -62,6 +62,7 @@
     IndexLabel,
     Level,
     NpDtype,
+    NumpyAxis,
     PythonFuncType,
     Renamer,
     Scalar,
@@ -3189,7 +3190,7 @@ def memory_usage(self, index: bool = True, deep: bool = False) -> Series:
             ).append(result)
         return result
 
-    def transpose(self, *args, copy: bool = False) -> DataFrame:
+    def transpose(self, axes: NumpyAxis = None, copy: bool = False) -> DataFrame:
         """
         Transpose index and columns.
 
@@ -3199,7 +3200,7 @@ def transpose(self, *args, copy: bool = False) -> DataFrame:
 
         Parameters
         ----------
-        *args : tuple, optional
+        axes : tuple or list, optional
             Accepted for compatibility with NumPy.
         copy : bool, default False
             Whether to copy the data after transposing, even for DataFrames
@@ -3286,7 +3287,7 @@ def transpose(self, *args, copy: bool = False) -> DataFrame:
         1    object
         dtype: object
         """
-        nv.validate_transpose(args, {})
+        nv.validate_transpose(axes, {})
         # construct the args
 
         dtypes = list(self.dtypes)
@@ -5015,7 +5016,7 @@ def rename(
     def fillna(
         self,
         value=...,
-        method: str | None = ...,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None = ...,
         axis: Axis | None = ...,
         inplace: Literal[False] = ...,
         limit=...,
@@ -5027,7 +5028,7 @@ def fillna(
     def fillna(
         self,
         value,
-        method: str | None,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None,
         axis: Axis | None,
         inplace: Literal[True],
         limit=...,
@@ -5060,7 +5061,7 @@ def fillna(
     def fillna(
         self,
         *,
-        method: str | None,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None,
         inplace: Literal[True],
         limit=...,
         downcast=...,
@@ -5082,7 +5083,7 @@ def fillna(
     def fillna(
         self,
         *,
-        method: str | None,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None,
         axis: Axis | None,
         inplace: Literal[True],
         limit=...,
@@ -5106,7 +5107,7 @@ def fillna(
     def fillna(
         self,
         value,
-        method: str | None,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None,
         *,
         inplace: Literal[True],
         limit=...,
@@ -5118,7 +5119,7 @@ def fillna(
     def fillna(
         self,
         value=...,
-        method: str | None = ...,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None = ...,
         axis: Axis | None = ...,
         inplace: bool = ...,
         limit=...,
@@ -5129,8 +5130,8 @@ def fillna(
     @doc(NDFrame.fillna, **_shared_doc_kwargs)
     def fillna(
         self,
-        value=None,
-        method: str | None = None,
+        value: Any | ArrayLike | None = None,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None = None,
         axis: Axis | None = None,
         inplace: bool = False,
         limit=None,

pandas/core/series.py

@@ -4594,7 +4594,7 @@ def drop(
     def fillna(
         self,
         value=...,
-        method: str | None = ...,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None = ...,
         axis: Axis | None = ...,
         inplace: Literal[False] = ...,
         limit=...,
@@ -4606,7 +4606,7 @@ def fillna(
     def fillna(
         self,
         value,
-        method: str | None,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None,
         axis: Axis | None,
         inplace: Literal[True],
         limit=...,
@@ -4639,7 +4639,7 @@ def fillna(
     def fillna(
         self,
         *,
-        method: str | None,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None,
         inplace: Literal[True],
         limit=...,
         downcast=...,
@@ -4661,7 +4661,7 @@ def fillna(
     def fillna(
         self,
         *,
-        method: str | None,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None,
         axis: Axis | None,
         inplace: Literal[True],
         limit=...,
@@ -4685,7 +4685,7 @@ def fillna(
     def fillna(
         self,
         value,
-        method: str | None,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None,
         *,
         inplace: Literal[True],
         limit=...,
@@ -4697,7 +4697,7 @@ def fillna(
     def fillna(
         self,
         value=...,
-        method: str | None = ...,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None = ...,
         axis: Axis | None = ...,
         inplace: bool = ...,
         limit=...,
@@ -4709,8 +4709,8 @@ def fillna(
     @doc(NDFrame.fillna, **_shared_doc_kwargs)  # type: ignore[has-type]
     def fillna(
         self,
-        value=None,
-        method=None,
+        value: Any | ArrayLike | None = None,
+        method: Literal["backfill", "bfill", "ffill", "pad"] | None = None,
         axis=None,
         inplace=False,
         limit=None,