8000 TYP overload fillna #40737 by LarWong · Pull Request #40887 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

TYP overload fillna #40737 #40887

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 15 commits into from
Apr 15, 2021
Merged

TYP overload fillna #40737 #40887

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
79f6b50
TYP: Added overloads for fillna() in frame.py and series.py
Apr 11, 2021
9b6966a
TYP: Added overloads for fillna() in frame.py and series.py #40737
Apr 11, 2021
fce2d11
TYP: Added fillna() overloads to generic.py #40727
Apr 11, 2021
bd93f31
Merge branch 'typ-fillna' of github.com:LarWong/pandas into typ-fillna
Apr 11, 2021
16b42e7
TYP: removed generic overloads #40737
Apr 11, 2021
2ab41f8
fixed redundant cast error
Apr 12, 2021
d6cc081
Merge remote-tracking branch 'upstream/master' into typ-fillna
Apr 12, 2021
a641df2
reverting prior changes
Apr 12, 2021
45cc60c
remove cast again
Apr 12, 2021
1c33bd5
Merge remote-tracking branch 'upstream/master' into typ-fillna
Apr 12, 2021
b6a4fac
removed unnecessary overloads in frame.py and series.py
Apr 12, 2021
2adcaf7
fixed overloads
Apr 12, 2021
4b7744e
Merge remote-tracking branch 'upstream/master' into typ-fillna
Apr 15, 2021
0c3d28d
reverted value typing
Apr 15, 2021
1c8dd1a
remove extra types (lets keep this to overloads)
MarcoGorelli Apr 15, 2021
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
Prev Previous commit
Next Next commit
TYP: removed generic overloads #40737
  • Loading branch information
LarWong committed Apr 11, 2021
commit 16b42e78b39f781f90bb6dd7db5ed964b6934bc4
349 changes: 0 additions & 349 deletions pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
Manager,
NpDtype,
Renamer,
Scalar,
StorageOptions,
T,
TimedeltaConvertibleTypes,
Expand Down Expand Up @@ -6270,354 +6269,6 @@ def convert_dtypes(
# ----------------------------------------------------------------------
# Filling NA's

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None = ...,
method: str | None = ...,
axis: Axis | None = ...,
inplace: Literal[False] = ...,
limit: int | None = ...,
downcast: dict | str | None = ...,
) -> FrameOrSeries | None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
method: str | None,
axis: Axis | None,
inplace: Literal[True],
limit: int | None,
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
inplace: Literal[True],
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
*,
inplace: Literal[True],
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
method: str | None,
inplace: Literal[True],
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
axis: Axis | None,
inplace: Literal[True],
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
inplace: Literal[True],
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
method: str | None,
*,
inplace: Literal[True],
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
*,
axis: Axis | None,
inplace: Literal[True],
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
*,
inplace: Literal[True],
limit: int | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
*,
inplace: Literal[True],
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
method: str | None,
axis: Axis | None,
inplace: Literal[True],
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
method: str | None,
inplace: Literal[True],
limit: int | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
method: str | None,
inplace: Literal[True],
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
axis: Axis | None,
inplace: Literal[True],
limit: int | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
axis: Axis | None,
inplace: Literal[True],
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
inplace: Literal[True],
limit: int | None,
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
method: str | None,
axis: Axis | None,
inplace: Literal[True],
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
method: str | None,
*,
inplace: Literal[True],
limit: int | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
method: str | None,
*,
inplace: Literal[True],
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
*,
axis: Axis | None,
inplace: Literal[True],
limit: int | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
*,
axis: Axis | None,
inplace: Literal[True],
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
*,
inplace: Literal[True],
limit: int | None,
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
method: str | None,
axis: Axis | None,
inplace: Literal[True],
limit: int | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
method: str | None,
axis: Axis | None,
inplace: Literal[True],
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
method: str | None,
inplace: Literal[True],
limit: int | None,
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
axis: Axis | None,
inplace: Literal[True],
limit: int | None,
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
*,
method: str | None,
axis: Axis | None,
inplace: Literal[True],
limit: int | None,
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
*,
axis: Axis | None,
inplace: Literal[True],
limit: int | None,
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
method: str | None,
*,
inplace: Literal[True],
limit: int | None,
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
method: str | None,
axis: Axis | None,
inplace: Literal[True],
*,
downcast: dict | str | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None,
method: str | None,
axis: Axis | None,
inplace: Literal[True],
limit: int | None,
) -> None:
...

@overload
def fillna(
self: FrameOrSeries,
value: Scalar | dict | Series | DataFrame | None = ...,
method: str | None = ...,
axis: Axis | None = ...,
inplace: bool_t = ...,
limit: int | None = ...,
downcast: dict | str | None = ...,
) -> FrameOrSeries | None:
...

@doc(**_shared_doc_kwargs)
def fillna(
self: FrameOrSeries,
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4918,7 +4918,7 @@ def fillna(
inplace: bool = ...,
limit: int | None = ...,
downcast: dict | str | None = ...,
) -> DataFrame | None:
) -> Series | None:
...

@doc(NDFrame.fillna, **_shared_doc_kwargs)
Expand Down
0