Skip to content

Commit 16545e3

Browse files
committed
Update na_action for dataframe map
1 parent 0903d15 commit 16545e3

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

pandas/conftest.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,15 @@ def nselect_method(request):
405405
@pytest.fixture(params=[None, "ignore", "raise"])
406406
def na_action(request):
407407
"""
408-
Fixture for 'na_action' argument in map.
408+
Fixture for 'na_action' argument in Series.map.
409+
"""
410+
return request.param
411+
412+
413+
@pytest.fixture(params=[None, "ignore"])
414+
def na_action_frame(request):
415+
"""
416+
Fixture for 'na_action' argument in DataFrame.map.
409417
"""
410418
return request.param
411419

pandas/tests/frame/methods/test_map.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_map_float_object_conversion(val):
3333
assert result == object
3434

3535

36-
def test_map_keeps_dtype(na_action):
36+
def test_map_keeps_dtype(na_action_frame):
3737
# GH52219
3838
arr = Series(["a", np.nan, "b"])
3939
sparse_arr = arr.astype(pd.SparseDtype(object))
@@ -42,15 +42,15 @@ def test_map_keeps_dtype(na_action):
4242
def func(x):
4343
return str.upper(x) if not pd.isna(x) else x
4444

45-
result = df.map(func, na_action=na_action)
45+
result = df.map(func, na_action=na_action_frame)
4646

4747
expected_sparse = pd.array(["A", np.nan, "B"], dtype=pd.SparseDtype(object))
4848
expected_arr = expected_sparse.astype(object)
4949
expected = DataFrame({"a": expected_arr, "b": expected_sparse})
5050

5151
tm.assert_frame_equal(result, expected)
5252

53-
result_empty = df.iloc[:0, :].map(func, na_action=na_action)
53+
result_empty = df.iloc[:0, :].map(func, na_action=na_action_frame)
5454
expected_empty = expected.iloc[:0, :]
5555
tm.assert_frame_equal(result_empty, expected_empty)
5656

0 commit comments

Comments
 (0)