Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
42 changes: 36 additions & 6 deletions pandas-stubs/core/frame.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -799,23 +799,53 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
@overload
def replace(
self,
to_replace=...,
value: Scalar | NAType | Sequence | Mapping | Pattern | None = ...,
to_replace: (
Scalar
| NAType
| Sequence[Scalar | Pattern]
| Mapping[Hashable, Scalar | Pattern]
| Pattern
| None
) = ...,
value: (
Scalar | NAType | Sequence[Scalar] | Mapping[Hashable, Scalar] | None
) = ...,
*,
inplace: Literal[True],
limit: int | None = ...,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

limit is deprecated, so we should remove it.

regex=...,
regex: (
bool
| str
| Pattern
| Sequence[str | Pattern]
| Mapping[Hashable, str | Pattern]
) = ...,
method: ReplaceMethod = ...,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

method is deprecated so we should remove it

) -> None: ...
@overload
def replace(
self,
to_replace=...,
value: Scalar | NAType | Sequence | Mapping | Pattern | None = ...,
to_replace: (
Scalar
| NAType
| Sequence[Scalar | Pattern]
| Mapping[Hashable, Scalar | Pattern]
| Pattern
| None
) = ...,
value: (
Scalar | NAType | Sequence[Scalar] | Mapping[Hashable, Scalar] | None
) = ...,
*,
inplace: Literal[False] = ...,
limit: int | None = ...,
regex=...,
regex: (
bool
| str
| Pattern
| Sequence[str | Pattern]
| Mapping[Hashable, str | Pattern]
) = ...,
method: ReplaceMethod = ...,
) -> Self: ...
def shift(
Expand Down
33 changes: 33 additions & 0 deletions tests/test_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import io
import itertools
from pathlib import Path
import re
import string
import sys
from typing import (
Expand Down Expand Up @@ -2570,6 +2571,38 @@ def test_types_replace() -> None:
assert assert_type(df.replace(1, 2, inplace=True), None) is None


def test_dataframe_replace() -> None:
df = pd.DataFrame({"col1": ["a", "ab", "ba"]})
pattern = re.compile(r"^a.*")
check(assert_type(df.replace("a", "x"), pd.DataFrame), pd.DataFrame)
check(assert_type(df.replace(pattern, "x"), pd.DataFrame), pd.DataFrame)
check(
assert_type(df.replace({"col1": "a"}, {"col1": "x"}), pd.DataFrame),
pd.DataFrame,
)
check(
assert_type(df.replace({"col1": pattern}, {"col1": "x"}), pd.DataFrame),
pd.DataFrame,
)
check(assert_type(df.replace(["a"], ["x"]), pd.DataFrame), pd.DataFrame)
check(assert_type(df.replace([pattern], ["x"]), pd.DataFrame), pd.DataFrame)
check(assert_type(df.replace("^a.*", "x", regex=True), pd.DataFrame), pd.DataFrame)
check(assert_type(df.replace(value="x", regex="^a."), pd.DataFrame), pd.DataFrame)
check(assert_type(df.replace(value="x", regex=["^a."]), pd.DataFrame), pd.DataFrame)
check(
assert_type(df.replace(value="x", regex={"col1": "^a."}), pd.DataFrame),
pd.DataFrame,
)
check(assert_type(df.replace(value="x", regex=pattern), pd.DataFrame), pd.DataFrame)
check(
assert_type(df.replace(value="x", regex=[pattern]), pd.DataFrame), pd.DataFrame
)
check(
assert_type(df.replace(value="x", regex={"col1": pattern}), pd.DataFrame),
pd.DataFrame,
)


def test_loop_dataframe() -> None:
# GH 70
df = pd.DataFrame({"x": [1, 2, 3]})
Expand Down