Skip to content

Commit 68cc56d

Browse files
authored
TYP: fix NDFrame._value type (#50763)
fix NDFrame._value type
1 parent fc627fa commit 68cc56d

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

pandas/core/frame.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -962,12 +962,8 @@ def _can_fast_transpose(self) -> bool:
962962
# TODO(EA2D) special case would be unnecessary with 2D EAs
963963
return not is_1d_only_ea_dtype(dtype)
964964

965-
# error: Return type "Union[ndarray, DatetimeArray, TimedeltaArray]" of
966-
# "_values" incompatible with return type "ndarray" in supertype "NDFrame"
967965
@property
968-
def _values( # type: ignore[override]
969-
self,
970-
) -> np.ndarray | DatetimeArray | TimedeltaArray | PeriodArray:
966+
def _values(self) -> np.ndarray | DatetimeArray | TimedeltaArray | PeriodArray:
971967
"""
972968
Analogue to ._values that may return a 2D ExtensionArray.
973969
"""

pandas/core/generic.py

+2-9
Original file line numberDiff line numberDiff line change
@@ -1805,14 +1805,7 @@ def _get_label_or_level_values(self, key: Level, axis: AxisInt = 0) -> ArrayLike
18051805
self._check_label_or_level_ambiguity(key, axis=axis)
18061806
values = self.xs(key, axis=other_axes[0])._values
18071807
elif self._is_level_reference(key, axis=axis):
1808-
# error: Incompatible types in assignment (expression has type "Union[
1809-
# ExtensionArray, ndarray[Any, Any]]", variable has type "ndarray[Any,
1810-
# Any]")
1811-
values = (
1812-
self.axes[axis]
1813-
.get_level_values(key) # type: ignore[assignment]
1814-
._values
1815-
)
1808+
values = self.axes[axis].get_level_values(key)._values
18161809
else:
18171810
raise KeyError(key)
18181811

@@ -5975,7 +5968,7 @@ def values(self):
59755968
raise AbstractMethodError(self)
59765969

59775970
@property
5978-
def _values(self) -> np.ndarray:
5971+
def _values(self) -> ArrayLike:
59795972
"""internal implementation"""
59805973
raise AbstractMethodError(self)
59815974

0 commit comments

Comments
 (0)