Skip to content

Commit 2242796

Browse files
committed
Adjust raises_chained_assignment_error and its dependencies to the new API of assert_produces_warning
1 parent 74b93de commit 2242796

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

pandas/_testing/contexts.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ def raises_chained_assignment_error(warn=True, extra_warnings=(), extra_match=()
210210
elif PYPY and extra_warnings:
211211
return assert_produces_warning(
212212
extra_warnings,
213-
match="|".join(extra_match),
213+
match=extra_match,
214214
)
215215
else:
216216
if using_copy_on_write():
@@ -227,7 +227,7 @@ def raises_chained_assignment_error(warn=True, extra_warnings=(), extra_match=()
227227
warning = (warning, *extra_warnings) # type: ignore[assignment]
228228
return assert_produces_warning(
229229
warning,
230-
match="|".join((match, *extra_match)),
230+
match=(match, *extra_match),
231231
)
232232

233233

pandas/tests/copy_view/test_chained_assignment_deprecation.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,8 @@ def test_frame_setitem(indexer, using_copy_on_write):
170170
extra_warnings = () if using_copy_on_write else (SettingWithCopyWarning,)
171171

172172
with option_context("chained_assignment", "warn"):
173-
with tm.raises_chained_assignment_error(extra_warnings=extra_warnings):
173+
with tm.raises_chained_assignment_error(
174+
extra_warnings=extra_warnings,
175+
extra_match=(None for _ in range(len(extra_warnings))),
176+
):
174177
df[0:3][indexer] = 10

pandas/tests/frame/methods/test_interpolate.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
from pandas._config import using_pyarrow_string_dtype
55

6-
from pandas.errors import ChainedAssignmentError
76
import pandas.util._test_decorators as td
87

98
from pandas import (
@@ -392,8 +391,8 @@ def test_interp_inplace(self, using_copy_on_write):
392391
msg = "The 'downcast' keyword in Series.interpolate is deprecated"
393392

394393
if using_copy_on_write:
395-
with tm.assert_produces_warning(
396-
(FutureWarning, ChainedAssignmentError), match=msg
394+
with tm.raises_chained_assignment_error(
395+
extra_warnings=(FutureWarning,), extra_match=(msg,)
397396
):
398397
return_value = result["a"].interpolate(inplace=True, downcast="infer")
399398
assert return_value is None

pandas/tests/indexing/test_chaining_and_caching.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,9 @@ def test_detect_chained_assignment_changing_dtype(
457457
with tm.raises_chained_assignment_error():
458458
df.loc[2]["C"] = "foo"
459459
tm.assert_frame_equal(df, df_original)
460-
with tm.raises_chained_assignment_error(extra_warnings=(FutureWarning,)):
460+
with tm.raises_chained_assignment_error(
461+
extra_warnings=(FutureWarning,), extra_match=(None,)
462+
):
461463
df["C"][2] = "foo"
462464
if using_copy_on_write:
463465
tm.assert_frame_equal(df, df_original)

0 commit comments

Comments
 (0)