Skip to content

Commit 3242b4e

Browse files
authored
CLN: move away from .values, _ndarray_values (#32419)
1 parent 67aae80 commit 3242b4e

File tree

7 files changed

+19
-17
lines changed

7 files changed

+19
-17
lines changed

pandas/_testing.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -706,11 +706,11 @@ def _get_ilevel_values(index, level):
706706
if isinstance(left, pd.PeriodIndex) or isinstance(right, pd.PeriodIndex):
707707
assert_attr_equal("freq", left, right, obj=obj)
708708
if isinstance(left, pd.IntervalIndex) or isinstance(right, pd.IntervalIndex):
709-
assert_interval_array_equal(left.values, right.values)
709+
assert_interval_array_equal(left._values, right._values)
710710

711711
if check_categorical:
712712
if is_categorical_dtype(left) or is_categorical_dtype(right):
713-
assert_categorical_equal(left.values, right.values, obj=f"{obj} category")
713+
assert_categorical_equal(left._values, right._values, obj=f"{obj} category")
714714

715715

716716
def assert_class_equal(left, right, exact: Union[bool, str] = True, obj="Input"):
@@ -883,7 +883,7 @@ def assert_interval_array_equal(left, right, exact="equiv", obj="IntervalArray")
883883
def assert_period_array_equal(left, right, obj="PeriodArray"):
884884
_check_isinstance(left, right, PeriodArray)
885885

886-
assert_numpy_array_equal(left._data, right._data, obj=f"{obj}.values")
886+
assert_numpy_array_equal(left._data, right._data, obj=f"{obj}._data")
887887
assert_attr_equal("freq", left, right, obj=obj)
888888

889889

@@ -1170,10 +1170,10 @@ def assert_series_equal(
11701170

11711171
# datetimelike may have different objects (e.g. datetime.datetime
11721172
# vs Timestamp) but will compare equal
1173-
if not Index(left.values).equals(Index(right.values)):
1173+
if not Index(left._values).equals(Index(right._values)):
11741174
msg = (
1175-
f"[datetimelike_compat=True] {left.values} "
1176-
f"is not equal to {right.values}."
1175+
f"[datetimelike_compat=True] {left._values} "
1176+
f"is not equal to {right._values}."
11771177
)
11781178
raise AssertionError(msg)
11791179
else:
@@ -1212,8 +1212,8 @@ def assert_series_equal(
12121212
if check_categorical:
12131213
if is_categorical_dtype(left) or is_categorical_dtype(right):
12141214
assert_categorical_equal(
1215-
left.values,
1216-
right.values,
1215+
left._values,
1216+
right._values,
12171217
obj=f"{obj} category",
12181218
check_category_order=check_category_order,
12191219
)

pandas/core/dtypes/cast.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1181,9 +1181,11 @@ def try_timedelta(v):
11811181
from pandas import to_timedelta
11821182

11831183
try:
1184-
return to_timedelta(v)._ndarray_values.reshape(shape)
1184+
td_values = to_timedelta(v)
11851185
except ValueError:
11861186
return v.reshape(shape)
1187+
else:
1188+
return np.asarray(td_values).reshape(shape)
11871189

11881190
inferred_type = lib.infer_datetimelike_array(ensure_object(v))
11891191

pandas/core/frame.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4580,7 +4580,7 @@ def drop_duplicates(
45804580
duplicated = self.duplicated(subset, keep=keep)
45814581

45824582
if inplace:
4583-
(inds,) = (-duplicated)._ndarray_values.nonzero()
4583+
(inds,) = np.asarray(-duplicated).nonzero()
45844584
new_data = self._data.take(inds)
45854585

45864586
if ignore_index:

pandas/core/indexes/multi.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2998,7 +2998,7 @@ def _update_indexer(idxr, indexer=indexer):
29982998
indexer = _update_indexer(indexers, indexer=indexer)
29992999
else:
30003000
# no matches we are done
3001-
return Int64Index([])._ndarray_values
3001+
return np.array([], dtype=np.int64)
30023002

30033003
elif com.is_null_slice(k):
30043004
# empty slice
@@ -3024,7 +3024,7 @@ def _update_indexer(idxr, indexer=indexer):
30243024

30253025
# empty indexer
30263026
if indexer is None:
3027-
return Int64Index([])._ndarray_values
3027+
return np.array([], dtype=np.int64)
30283028

30293029
indexer = self._reorder_indexer(seq, indexer)
30303030

pandas/core/indexes/numeric.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ def equals(self, other) -> bool:
425425
other = self._constructor(other)
426426
if not is_dtype_equal(self.dtype, other.dtype) or self.shape != other.shape:
427427
return False
428-
left, right = self._ndarray_values, other._ndarray_values
428+
left, right = self._values, other._values
429429
return ((left == right) | (self._isnan & other._isnan)).all()
430430
except (TypeError, ValueError):
431431
return False

pandas/io/stata.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1672,7 +1672,7 @@ def _do_convert_missing(self, data: DataFrame, convert_missing: bool) -> DataFra
16721672
continue
16731673

16741674
if convert_missing: # Replacement follows Stata notation
1675-
missing_loc = np.nonzero(missing._ndarray_values)[0]
1675+
missing_loc = np.nonzero(np.asarray(missing))[0]
16761676
umissing, umissing_loc = np.unique(series[missing], return_inverse=True)
16771677
replacement = Series(series, dtype=np.object)
16781678
for j, um in enumerate(umissing):

pandas/plotting/_matplotlib/converter.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,13 @@ def _convert_1d(values, units, axis):
218218
if isinstance(values, valid_types) or is_integer(values) or is_float(values):
219219
return get_datevalue(values, axis.freq)
220220
elif isinstance(values, PeriodIndex):
221-
return values.asfreq(axis.freq)._ndarray_values
221+
return values.asfreq(axis.freq).asi8
222222
elif isinstance(values, Index):
223223
return values.map(lambda x: get_datevalue(x, axis.freq))
224224
elif lib.infer_dtype(values, skipna=False) == "period":
225225
# https://github.com/pandas-dev/pandas/issues/24304
226226
# convert ndarray[period] -> PeriodIndex
227-
return PeriodIndex(values, freq=axis.freq)._ndarray_values
227+
return PeriodIndex(values, freq=axis.freq).asi8
228228
elif isinstance(values, (list, tuple, np.ndarray, Index)):
229229
return [get_datevalue(x, axis.freq) for x in values]
230230
return values
@@ -607,7 +607,7 @@ def _daily_finder(vmin, vmax, freq):
607607
info = np.zeros(
608608
span, dtype=[("val", np.int64), ("maj", bool), ("min", bool), ("fmt", "|S20")]
609609
)
610-
info["val"][:] = dates_._ndarray_values
610+
info["val"][:] = dates_.asi8
611611
info["fmt"][:] = ""
612612
info["maj"][[0, -1]] = True
613613
# .. and set some shortcuts

0 commit comments

Comments
 (0)