Skip to content

REF: Prep for moving Series.apply into apply #39042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 8, 2021
Merged

REF: Prep for moving Series.apply into apply #39042

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 38 additions & 32 deletions pandas/core/apply.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def frame_apply(
result_type: Optional[str] = None,
args=None,
kwds=None,
):
) -> FrameApply:
""" construct and return a row or column based frame apply object """
axis = obj._get_axis_number(axis)
klass: Type[FrameApply]
Expand All @@ -63,35 +63,9 @@ def frame_apply(
)


class FrameApply(metaclass=abc.ABCMeta):

# ---------------------------------------------------------------
# Abstract Methods
class Apply(metaclass=abc.ABCMeta):
axis: int

@property
@abc.abstractmethod
def result_index(self) -> Index:
pass

@property
@abc.abstractmethod
def result_columns(self) -> Index:
pass

@property
@abc.abstractmethod
def series_generator(self) -> Iterator[Series]:
pass

@abc.abstractmethod
def wrap_results_for_axis(
self, results: ResType, res_index: Index
) -> FrameOrSeriesUnion:
pass

# ---------------------------------------------------------------

def __init__(
self,
obj: DataFrame,
Expand Down Expand Up @@ -132,6 +106,42 @@ def f(x):

self.f: AggFuncType = f

@property
def index(self) -> Index:
return self.obj.index

@abc.abstractmethod
def get_result(self):
pass


class FrameApply(Apply):
# ---------------------------------------------------------------
# Abstract Methods

@property
@abc.abstractmethod
def result_index(self) -> Index:
pass

@property
@abc.abstractmethod
def result_columns(self) -> Index:
pass

@property
@abc.abstractmethod
def series_generator(self) -> Iterator[Series]:
pass

@abc.abstractmethod
def wrap_results_for_axis(
self, results: ResType, res_index: Index
) -> FrameOrSeriesUnion:
pass

# ---------------------------------------------------------------

@property
def res_columns(self) -> Index:
return self.result_columns
Expand All @@ -140,10 +150,6 @@ def res_columns(self) -> Index:
def columns(self) -> Index:
return self.obj.columns

@property
def index(self) -> Index:
return self.obj.index

@cache_readonly
def values(self):
return self.obj.values
Expand Down