From e55b3ee9a4ba99a885022a249e9c1247e5e1e676 Mon Sep 17 00:00:00 2001 From: Natalia Mokeeva Date: Fri, 5 May 2023 22:26:21 +0200 Subject: [PATCH 1/3] remove ignore[assignment] from pandas/core/construction.py --- pandas/core/construction.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandas/core/construction.py b/pandas/core/construction.py index d626afa0c6e79..b5b29f19b8670 100644 --- a/pandas/core/construction.py +++ b/pandas/core/construction.py @@ -496,9 +496,7 @@ def sanitize_masked_array(data: ma.MaskedArray) -> np.ndarray: if mask.any(): dtype, fill_value = maybe_promote(data.dtype, np.nan) dtype = cast(np.dtype, dtype) - # Incompatible types in assignment (expression has type "ndarray[Any, - # dtype[Any]]", variable has type "MaskedArray[Any, Any]") - data = data.astype(dtype, copy=True) # type: ignore[assignment] + data = ma.asarray(data.astype(dtype, copy=True)) data.soften_mask() # set hardmask False if it was True data[mask] = fill_value else: From 533d841b7417dd6fb0655b2899b0af1c140c91c4 Mon Sep 17 00:00:00 2001 From: Natalia Mokeeva Date: Sat, 6 May 2023 14:48:22 +0200 Subject: [PATCH 2/3] rename data --- pandas/core/construction.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandas/core/construction.py b/pandas/core/construction.py index 9b4d67a20a7cd..4049ddd0e6e11 100644 --- a/pandas/core/construction.py +++ b/pandas/core/construction.py @@ -502,12 +502,12 @@ def sanitize_masked_array(data: ma.MaskedArray) -> np.ndarray: if mask.any(): dtype, fill_value = maybe_promote(data.dtype, np.nan) dtype = cast(np.dtype, dtype) - data = ma.asarray(data.astype(dtype, copy=True)) - data.soften_mask() # set hardmask False if it was True - data[mask] = fill_value + sanitized_ma = data.astype(dtype, copy=True) + sanitized_ma.soften_mask() # set hardmask False if it was True + sanitized_ma[mask] = fill_value + return sanitized_ma else: - data = data.copy() - return data + return data.copy() def sanitize_array( From 8a3449af1c54f15ded2ead7acdd747b92ec9e743 Mon Sep 17 00:00:00 2001 From: Natalia Mokeeva Date: Sat, 6 May 2023 17:19:05 +0200 Subject: [PATCH 3/3] Revert "rename data" This reverts commit 533d841b7417dd6fb0655b2899b0af1c140c91c4. --- pandas/core/construction.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandas/core/construction.py b/pandas/core/construction.py index 4049ddd0e6e11..9b4d67a20a7cd 100644 --- a/pandas/core/construction.py +++ b/pandas/core/construction.py @@ -502,12 +502,12 @@ def sanitize_masked_array(data: ma.MaskedArray) -> np.ndarray: if mask.any(): dtype, fill_value = maybe_promote(data.dtype, np.nan) dtype = cast(np.dtype, dtype) - sanitized_ma = data.astype(dtype, copy=True) - sanitized_ma.soften_mask() # set hardmask False if it was True - sanitized_ma[mask] = fill_value - return sanitized_ma + data = ma.asarray(data.astype(dtype, copy=True)) + data.soften_mask() # set hardmask False if it was True + data[mask] = fill_value else: - return data.copy() + data = data.copy() + return data def sanitize_array(