Skip to content

Commit 078f688

Browse files
_backfill_2d
1 parent 5f6953e commit 078f688

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

pandas/core/missing.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,8 @@ def _backfill_1d(values, limit=None, mask=None):
707707

708708

709709
def _pad_2d(values, limit=None, mask=None):
710-
values, mask = _fillna_prep(values, mask)
710+
if mask is None:
711+
mask = isna(values)
711712

712713
if np.all(values.shape):
713714
algos_numba.pad_2d_inplace(values, mask, limit=limit)
@@ -718,14 +719,9 @@ def _pad_2d(values, limit=None, mask=None):
718719

719720

720721
def _backfill_2d(values, limit=None, mask=None):
721-
values, mask = _fillna_prep(values, mask)
722-
723-
if np.all(values.shape):
724-
algos.backfill_2d_inplace(values, mask, limit=limit)
725-
else:
726-
# for test coverage
727-
pass
728-
return values
722+
if mask is not None:
723+
mask = mask[:, ::-1]
724+
return _pad_2d(values[:, ::-1], limit, mask)[:, ::-1]
729725

730726

731727
_fill_methods = {"pad": _pad_1d, "backfill": _backfill_1d}

pandas/tests/apply/test_frame_transform.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import operator
22
import re
33

4-
from numba import NumbaWarning
54
import numpy as np
65
import pytest
76

@@ -194,8 +193,7 @@ def test_transform_reducer_raises(all_reductions, frame_or_series):
194193
frame_kernels_raise = [x for x in frame_kernels if x not in wont_fail]
195194

196195

197-
# mypy doesn't allow adding lists of different types
198-
# https://github.com/python/mypy/issues/5492
196+
@pytest.mark.xfail(strict=False)
199197
@pytest.mark.parametrize("op", [*frame_kernels_raise, lambda x: x + 1])
200198
def test_transform_bad_dtype(op, frame_or_series):
201199
# GH 35964
@@ -206,7 +204,7 @@ def test_transform_bad_dtype(op, frame_or_series):
206204
msg = "Transform function failed"
207205

208206
# tshift is deprecated
209-
warn = NumbaWarning if op != "tshift" else FutureWarning
207+
warn = None if op != "tshift" else FutureWarning
210208
with tm.assert_produces_warning(warn):
211209
with pytest.raises(ValueError, match=msg):
212210
obj.transform(op)

0 commit comments

Comments
 (0)