From 8d1a505ccf2b30c9f17062b288a241450d1b99a1 Mon Sep 17 00:00:00 2001 From: nickleus27 Date: Sun, 28 Nov 2021 19:39:29 -0800 Subject: [PATCH 1/4] changed cat_array to cat_array_list --- pandas/core/dtypes/dtypes.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pandas/core/dtypes/dtypes.py b/pandas/core/dtypes/dtypes.py index e20670893f71c..7d84d903c84b0 100644 --- a/pandas/core/dtypes/dtypes.py +++ b/pandas/core/dtypes/dtypes.py @@ -465,9 +465,11 @@ def _hash_categories(self) -> int: [cat_array, np.arange(len(cat_array), dtype=cat_array.dtype)] ) else: - # error: Incompatible types in assignment (expression has type - # "List[ndarray]", variable has type "ndarray") - cat_array = [cat_array] # type: ignore[assignment] + cat_array_list = [cat_array] + combined_hashed = combine_hash_arrays( + iter(cat_array_list), num_items=len(cat_array_list) + ) + return np.bitwise_xor.reduce(combined_hashed) combined_hashed = combine_hash_arrays(iter(cat_array), num_items=len(cat_array)) return np.bitwise_xor.reduce(combined_hashed) From dfe094bdc24f1fbd181e4f128714475eeafd4413 Mon Sep 17 00:00:00 2001 From: nickleus27 Date: Sun, 28 Nov 2021 19:42:16 -0800 Subject: [PATCH 2/4] changed arr to arr_list --- pandas/core/arrays/categorical.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pandas/core/arrays/categorical.py b/pandas/core/arrays/categorical.py index 4c6a32ff1ba4e..b5d5b28694734 100644 --- a/pandas/core/arrays/categorical.py +++ b/pandas/core/arrays/categorical.py @@ -421,13 +421,10 @@ def __init__( if null_mask.any(): # We remove null values here, then below will re-insert # them, grep "full_codes" - - # error: Incompatible types in assignment (expression has type - # "List[Any]", variable has type "ExtensionArray") - arr = [ # type: ignore[assignment] + arr_list = [ values[idx] for idx in np.where(~null_mask)[0] ] - arr = sanitize_array(arr, None) + arr = sanitize_array(arr_list, None) values = arr if dtype.categories is None: From d74ed3106fad46c5b420d34f6b08d263fc88f7d3 Mon Sep 17 00:00:00 2001 From: nickleus27 Date: Sun, 28 Nov 2021 19:47:50 -0800 Subject: [PATCH 3/4] pre-commit --- pandas/core/arrays/categorical.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandas/core/arrays/categorical.py b/pandas/core/arrays/categorical.py index b5d5b28694734..16fcf6daf5aef 100644 --- a/pandas/core/arrays/categorical.py +++ b/pandas/core/arrays/categorical.py @@ -421,9 +421,7 @@ def __init__( if null_mask.any(): # We remove null values here, then below will re-insert # them, grep "full_codes" - arr_list = [ - values[idx] for idx in np.where(~null_mask)[0] - ] + arr_list = [values[idx] for idx in np.where(~null_mask)[0]] arr = sanitize_array(arr_list, None) values = arr From 1ffe011b9afa8c7c979a7bfa5a5e4b12debebdd1 Mon Sep 17 00:00:00 2001 From: nickleus27 Date: Thu, 2 Dec 2021 11:28:49 -0800 Subject: [PATCH 4/4] removed repeated code --- pandas/core/dtypes/dtypes.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pandas/core/dtypes/dtypes.py b/pandas/core/dtypes/dtypes.py index 7d84d903c84b0..71da0a4b20b41 100644 --- a/pandas/core/dtypes/dtypes.py +++ b/pandas/core/dtypes/dtypes.py @@ -465,11 +465,7 @@ def _hash_categories(self) -> int: [cat_array, np.arange(len(cat_array), dtype=cat_array.dtype)] ) else: - cat_array_list = [cat_array] - combined_hashed = combine_hash_arrays( - iter(cat_array_list), num_items=len(cat_array_list) - ) - return np.bitwise_xor.reduce(combined_hashed) + cat_array = np.array([cat_array]) combined_hashed = combine_hash_arrays(iter(cat_array), num_items=len(cat_array)) return np.bitwise_xor.reduce(combined_hashed)