From 6ea283a820756bb7289289b02292cef5ec4b3c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20W=C3=B6rtwein?= Date: Fri, 1 Apr 2022 08:02:13 -0400 Subject: [PATCH] TYP: na_value --- pandas/core/algorithms.py | 2 +- pandas/core/arrays/base.py | 2 +- pandas/core/arrays/masked.py | 2 +- pandas/core/arrays/numpy_.py | 2 +- pandas/core/base.py | 2 +- pandas/core/internals/managers.py | 4 ++-- pandas/tests/extension/decimal/array.py | 6 +++++- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py index 6c1dfc4c0da72..b17ca61b59e78 100644 --- a/pandas/core/algorithms.py +++ b/pandas/core/algorithms.py @@ -500,7 +500,7 @@ def factorize_array( values: np.ndarray, na_sentinel: int = -1, size_hint: int | None = None, - na_value=None, + na_value: object = None, mask: npt.NDArray[np.bool_] | None = None, ) -> tuple[npt.NDArray[np.intp], np.ndarray]: """ diff --git a/pandas/core/arrays/base.py b/pandas/core/arrays/base.py index b06a46dfd1447..a188692a2d8f7 100644 --- a/pandas/core/arrays/base.py +++ b/pandas/core/arrays/base.py @@ -460,7 +460,7 @@ def to_numpy( self, dtype: npt.DTypeLike | None = None, copy: bool = False, - na_value=lib.no_default, + na_value: object = lib.no_default, ) -> np.ndarray: """ Convert to a NumPy ndarray. diff --git a/pandas/core/arrays/masked.py b/pandas/core/arrays/masked.py index 95363e598a06c..f61a61498cde4 100644 --- a/pandas/core/arrays/masked.py +++ b/pandas/core/arrays/masked.py @@ -336,7 +336,7 @@ def to_numpy( self, dtype: npt.DTypeLike | None = None, copy: bool = False, - na_value: Scalar | lib.NoDefault | libmissing.NAType = lib.no_default, + na_value: object = lib.no_default, ) -> np.ndarray: """ Convert to a NumPy Array. diff --git a/pandas/core/arrays/numpy_.py b/pandas/core/arrays/numpy_.py index be7dc5e0ebdc6..36c67d2fe1225 100644 --- a/pandas/core/arrays/numpy_.py +++ b/pandas/core/arrays/numpy_.py @@ -368,7 +368,7 @@ def to_numpy( self, dtype: npt.DTypeLike | None = None, copy: bool = False, - na_value=lib.no_default, + na_value: object = lib.no_default, ) -> np.ndarray: result = np.asarray(self._ndarray, dtype=dtype) diff --git a/pandas/core/base.py b/pandas/core/base.py index e03b05f539e8f..73f5ad17f3f1c 100644 --- a/pandas/core/base.py +++ b/pandas/core/base.py @@ -433,7 +433,7 @@ def to_numpy( self, dtype: npt.DTypeLike | None = None, copy: bool = False, - na_value=lib.no_default, + na_value: object = lib.no_default, **kwargs, ) -> np.ndarray: """ diff --git a/pandas/core/internals/managers.py b/pandas/core/internals/managers.py index 0a102d4e2bdc9..ded525cd099fc 100644 --- a/pandas/core/internals/managers.py +++ b/pandas/core/internals/managers.py @@ -1511,7 +1511,7 @@ def as_array( self, dtype: np.dtype | None = None, copy: bool = False, - na_value=lib.no_default, + na_value: object = lib.no_default, ) -> np.ndarray: """ Convert the blockmanager data into an numpy array. @@ -1570,7 +1570,7 @@ def as_array( def _interleave( self, dtype: np.dtype | None = None, - na_value=lib.no_default, + na_value: object = lib.no_default, ) -> np.ndarray: """ Return ndarray from blocks with specified item order diff --git a/pandas/tests/extension/decimal/array.py b/pandas/tests/extension/decimal/array.py index a3edc95fce96b..6eaa90d7b868a 100644 --- a/pandas/tests/extension/decimal/array.py +++ b/pandas/tests/extension/decimal/array.py @@ -105,7 +105,11 @@ def _from_factorized(cls, values, original): _HANDLED_TYPES = (decimal.Decimal, numbers.Number, np.ndarray) def to_numpy( - self, dtype=None, copy: bool = False, na_value=no_default, decimals=None + self, + dtype=None, + copy: bool = False, + na_value: object = no_default, + decimals=None, ) -> np.ndarray: result = np.asarray(self, dtype=dtype) if decimals is not None: