Skip to content

Commit dd72723

Browse files
committed
TYP: type NDFrame.(_get_axis|_get_axis_name|_get_axis_number)
1 parent 556e1c2 commit dd72723

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

pandas/core/generic.py

+15-18
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ def _construct_axes_from_arguments(
353353
return axes, kwargs
354354

355355
@classmethod
356-
def _get_axis_number(cls, axis):
356+
def _get_axis_number(cls, axis) -> int:
357357
axis = cls._AXIS_ALIASES.get(axis, axis)
358358
if is_integer(axis):
359359
if axis in cls._AXIS_NAMES:
@@ -366,7 +366,7 @@ def _get_axis_number(cls, axis):
366366
raise ValueError(f"No axis named {axis} for object type {cls.__name__}")
367367

368368
@classmethod
369-
def _get_axis_name(cls, axis):
369+
def _get_axis_name(cls, axis) -> str:
370370
axis = cls._AXIS_ALIASES.get(axis, axis)
371371
if isinstance(axis, str):
372372
if axis in cls._AXIS_NUMBERS:
@@ -378,12 +378,12 @@ def _get_axis_name(cls, axis):
378378
pass
379379
raise ValueError(f"No axis named {axis} for object type {cls.__name__}")
380380

381-
def _get_axis(self, axis):
381+
def _get_axis(self, axis) -> Index:
382382
name = self._get_axis_name(axis)
383383
return getattr(self, name)
384384

385385
@classmethod
386-
def _get_block_manager_axis(cls, axis):
386+
def _get_block_manager_axis(cls, axis) -> int:
387387
"""Map the axis to the block_manager axis."""
388388
axis = cls._get_axis_number(axis)
389389
if cls._AXIS_REVERSED:
@@ -590,7 +590,7 @@ def swapaxes(self: FrameOrSeries, axis1, axis2, copy=True) -> FrameOrSeries:
590590
if copy:
591591
new_values = new_values.copy()
592592

593-
return self._constructor(new_values, *new_axes).__finalize__(
593+
return self._constructor(new_values, *new_axes).__finalize__( # type: ignore
594594
self, method="swapaxes"
595595
)
596596

@@ -3490,6 +3490,7 @@ class animal locomotion
34903490
axis = self._get_axis_number(axis)
34913491
labels = self._get_axis(axis)
34923492
if level is not None:
3493+
assert isinstance(labels, MultiIndex), type(labels)
34933494
loc, new_ax = labels.get_loc_level(key, level=level, drop_level=drop_level)
34943495

34953496
# create the tuple of the indexer
@@ -7621,11 +7622,11 @@ def at_time(
76217622
axis = self._get_axis_number(axis)
76227623

76237624
index = self._get_axis(axis)
7624-
try:
7625-
indexer = index.indexer_at_time(time, asof=asof)
7626-
except AttributeError as err:
7627-
raise TypeError("Index must be DatetimeIndex") from err
76287625

7626+
if not isinstance(index, DatetimeIndex):
7627+
raise TypeError("Index must be DatetimeIndex")
7628+
7629+
indexer = index.indexer_at_time(time, asof=asof)
76297630
return self._take_with_is_copy(indexer, axis=axis)
76307631

76317632
def between_time(
@@ -7704,16 +7705,12 @@ def between_time(
77047705
axis = self._get_axis_number(axis)
77057706

77067707
index = self._get_axis(axis)
7707-
try:
7708-
indexer = index.indexer_between_time(
7709-
start_time,
7710-
end_time,
7711-
include_start=include_start,
7712-
include_end=include_end,
7713-
)
7714-
except AttributeError as err:
7715-
raise TypeError("Index must be DatetimeIndex") from err
7708+
if not isinstance(index, DatetimeIndex):
7709+
raise TypeError("Index must be DatetimeIndex")
77167710

7711+
indexer = index.indexer_between_time(
7712+
start_time, end_time, include_start=include_start, include_end=include_end,
7713+
)
77177714
return self._take_with_is_copy(indexer, axis=axis)
77187715

77197716
def resample(

0 commit comments

Comments
 (0)