Skip to content

Commit e6c5f5a

Browse files
mypy fixup
1 parent ed7e469 commit e6c5f5a

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

pandas/core/apply.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def frame_apply(
3434
axis = obj._get_axis_number(axis)
3535
klass: Type[FrameApply]
3636
if axis == 0:
37-
klass = FrameRowApply # type: Type[FrameApply]
37+
klass = FrameRowApply
3838
elif axis == 1:
3939
klass = FrameColumnApply
4040

pandas/core/arrays/integer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ def astype(self, dtype, copy=True):
521521

522522
# coerce
523523
data = self._coerce_to_ndarray()
524-
return astype_nansafe(data, dtype, copy=None)
524+
return astype_nansafe(data, dtype)
525525

526526
@property
527527
def _ndarray_values(self) -> np.ndarray:

pandas/core/groupby/ops.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"""
88

99
import collections
10-
from typing import Any, Dict, List, Optional, Sequence, Tuple, Type
10+
from typing import Any, Dict, Generic, List, Optional, Sequence, Tuple, Type
1111

1212
import numpy as np
1313

@@ -41,7 +41,6 @@
4141
from pandas.core.base import SelectionMixin
4242
import pandas.core.common as com
4343
from pandas.core.frame import DataFrame
44-
from pandas.core.generic import NDFrame
4544
from pandas.core.groupby import base, grouper
4645
from pandas.core.index import Index, MultiIndex, ensure_index
4746
from pandas.core.series import Series
@@ -861,7 +860,7 @@ def _is_indexed_like(obj, axes) -> bool:
861860
# Splitting / application
862861

863862

864-
class DataSplitter:
863+
class DataSplitter(Generic[FrameOrSeries]):
865864
def __init__(self, data: FrameOrSeries, labels, ngroups: int, axis: int = 0):
866865
self.data = data
867866
self.labels = ensure_int64(labels)
@@ -896,7 +895,7 @@ def __iter__(self):
896895
def _get_sorted_data(self) -> FrameOrSeries:
897896
return self.data.take(self.sort_idx, axis=self.axis)
898897

899-
def _chop(self, sdata, slice_obj: slice) -> NDFrame:
898+
def _chop(self, sdata: FrameOrSeries, slice_obj: slice) -> FrameOrSeries:
900899
raise AbstractMethodError(self)
901900

902901

@@ -920,7 +919,7 @@ def _chop(self, sdata: DataFrame, slice_obj: slice) -> DataFrame:
920919
return sdata._slice(slice_obj, axis=1)
921920

922921

923-
def get_splitter(data: FrameOrSeries, *args, **kwargs) -> DataSplitter:
922+
def get_splitter(data: FrameOrSeries, *args, **kwargs) -> "DataSplitter[FrameOrSeries]":
924923
klass: Type[DataSplitter]
925924
if isinstance(data, Series):
926925
klass = SeriesSplitter

pandas/core/reshape/merge.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ def __init__(
585585

586586
self.indicator_name: Optional[str]
587587
if isinstance(self.indicator, str):
588-
self.indicator_name = self.indicator # type: Optional[str]
588+
self.indicator_name = self.indicator
589589
elif isinstance(self.indicator, bool):
590590
self.indicator_name = "_merge" if self.indicator else None
591591
else:

0 commit comments

Comments
 (0)