@@ -353,7 +353,7 @@ def _construct_axes_from_arguments(
353
353
return axes , kwargs
354
354
355
355
@classmethod
356
- def _get_axis_number (cls , axis ):
356
+ def _get_axis_number (cls , axis ) -> int :
357
357
axis = cls ._AXIS_ALIASES .get (axis , axis )
358
358
if is_integer (axis ):
359
359
if axis in cls ._AXIS_NAMES :
@@ -366,7 +366,7 @@ def _get_axis_number(cls, axis):
366
366
raise ValueError (f"No axis named { axis } for object type { cls .__name__ } " )
367
367
368
368
@classmethod
369
- def _get_axis_name (cls , axis ):
369
+ def _get_axis_name (cls , axis ) -> str :
370
370
axis = cls ._AXIS_ALIASES .get (axis , axis )
371
371
if isinstance (axis , str ):
372
372
if axis in cls ._AXIS_NUMBERS :
@@ -378,12 +378,12 @@ def _get_axis_name(cls, axis):
378
378
pass
379
379
raise ValueError (f"No axis named { axis } for object type { cls .__name__ } " )
380
380
381
- def _get_axis (self , axis ):
381
+ def _get_axis (self , axis ) -> Index :
382
382
name = self ._get_axis_name (axis )
383
383
return getattr (self , name )
384
384
385
385
@classmethod
386
- def _get_block_manager_axis (cls , axis ):
386
+ def _get_block_manager_axis (cls , axis ) -> int :
387
387
"""Map the axis to the block_manager axis."""
388
388
axis = cls ._get_axis_number (axis )
389
389
if cls ._AXIS_REVERSED :
@@ -590,7 +590,7 @@ def swapaxes(self: FrameOrSeries, axis1, axis2, copy=True) -> FrameOrSeries:
590
590
if copy :
591
591
new_values = new_values .copy ()
592
592
593
- return self ._constructor (new_values , * new_axes ).__finalize__ (
593
+ return self ._constructor (new_values , * new_axes ).__finalize__ ( # type: ignore
594
594
self , method = "swapaxes"
595
595
)
596
596
@@ -3490,6 +3490,7 @@ class animal locomotion
3490
3490
axis = self ._get_axis_number (axis )
3491
3491
labels = self ._get_axis (axis )
3492
3492
if level is not None :
3493
+ assert isinstance (labels , MultiIndex ), type (labels )
3493
3494
loc , new_ax = labels .get_loc_level (key , level = level , drop_level = drop_level )
3494
3495
3495
3496
# create the tuple of the indexer
@@ -7621,11 +7622,11 @@ def at_time(
7621
7622
axis = self ._get_axis_number (axis )
7622
7623
7623
7624
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
7628
7625
7626
+ if not isinstance (index , DatetimeIndex ):
7627
+ raise TypeError ("Index must be DatetimeIndex" )
7628
+
7629
+ indexer = index .indexer_at_time (time , asof = asof )
7629
7630
return self ._take_with_is_copy (indexer , axis = axis )
7630
7631
7631
7632
def between_time (
@@ -7704,16 +7705,12 @@ def between_time(
7704
7705
axis = self ._get_axis_number (axis )
7705
7706
7706
7707
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" )
7716
7710
7711
+ indexer = index .indexer_between_time (
7712
+ start_time , end_time , include_start = include_start , include_end = include_end ,
7713
+ )
7717
7714
return self ._take_with_is_copy (indexer , axis = axis )
7718
7715
7719
7716
def resample (
0 commit comments