Skip to content

Commit 5f96f28

Browse files
authored
REF: remove checknull_old (#44541)
1 parent 7d6d609 commit 5f96f28

File tree

4 files changed

+13
-35
lines changed

4 files changed

+13
-35
lines changed

pandas/_libs/missing.pxd

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ from numpy cimport (
77
cpdef bint is_matching_na(object left, object right, bint nan_matches_none=*)
88

99
cpdef bint checknull(object val, bint inf_as_na=*)
10-
cpdef bint checknull_old(object val)
1110
cpdef ndarray[uint8_t] isnaobj(ndarray arr, bint inf_as_na=*)
1211

1312
cdef bint is_null_datetime64(v)

pandas/_libs/missing.pyx

-16
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,6 @@ cdef inline bint is_decimal_na(object val):
143143
return isinstance(val, cDecimal) and val != val
144144

145145

146-
cpdef bint checknull_old(object val):
147-
return checknull(val, inf_as_na=True)
148-
149-
150146
@cython.wraparound(False)
151147
@cython.boundscheck(False)
152148
cpdef ndarray[uint8_t] isnaobj(ndarray arr, bint inf_as_na=False):
@@ -184,12 +180,6 @@ cpdef ndarray[uint8_t] isnaobj(ndarray arr, bint inf_as_na=False):
184180
return result.view(np.bool_)
185181

186182

187-
@cython.wraparound(False)
188-
@cython.boundscheck(False)
189-
def isnaobj_old(arr: ndarray) -> ndarray:
190-
return isnaobj(arr, inf_as_na=True)
191-
192-
193183
@cython.wraparound(False)
194184
@cython.boundscheck(False)
195185
def isnaobj2d(arr: ndarray, inf_as_na: bool = False) -> ndarray:
@@ -229,12 +219,6 @@ def isnaobj2d(arr: ndarray, inf_as_na: bool = False) -> ndarray:
229219
return result.view(np.bool_)
230220

231221

232-
@cython.wraparound(False)
233-
@cython.boundscheck(False)
234-
def isnaobj2d_old(arr: ndarray) -> ndarray:
235-
return isnaobj2d(arr, inf_as_na=True)
236-
237-
238222
def isposinf_scalar(val: object) -> bool:
239223
return util.is_float_object(val) and val == INF
240224

pandas/core/dtypes/missing.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,7 @@ def _isna(obj, inf_as_na: bool = False):
158158
boolean ndarray or boolean
159159
"""
160160
if is_scalar(obj):
161-
if inf_as_na:
162-
return libmissing.checknull_old(obj)
163-
else:
164-
return libmissing.checknull(obj)
161+
return libmissing.checknull(obj, inf_as_na=inf_as_na)
165162
elif isinstance(obj, ABCMultiIndex):
166163
raise NotImplementedError("isna is not defined for MultiIndex")
167164
elif isinstance(obj, type):

pandas/tests/dtypes/test_missing.py

+12-14
Original file line numberDiff line numberDiff line change
@@ -562,21 +562,19 @@ def test_na_value_for_dtype(dtype, na_value):
562562

563563

564564
class TestNAObj:
565-
566-
_1d_methods = ["isnaobj", "isnaobj_old"]
567-
_2d_methods = ["isnaobj2d", "isnaobj2d_old"]
568-
569565
def _check_behavior(self, arr, expected):
570-
for method in TestNAObj._1d_methods:
571-
result = getattr(libmissing, method)(arr)
572-
tm.assert_numpy_array_equal(result, expected)
566+
result = libmissing.isnaobj(arr)
567+
tm.assert_numpy_array_equal(result, expected)
568+
result = libmissing.isnaobj(arr, inf_as_na=True)
569+
tm.assert_numpy_array_equal(result, expected)
573570

574571
arr = np.atleast_2d(arr)
575572
expected = np.atleast_2d(expected)
576573

577-
for method in TestNAObj._2d_methods:
578-
result = getattr(libmissing, method)(arr)
579-
tm.assert_numpy_array_equal(result, expected)
574+
result = libmissing.isnaobj2d(arr)
575+
tm.assert_numpy_array_equal(result, expected)
576+
result = libmissing.isnaobj2d(arr, inf_as_na=True)
577+
tm.assert_numpy_array_equal(result, expected)
580578

581579
def test_basic(self):
582580
arr = np.array([1, None, "foo", -5.1, NaT, np.nan])
@@ -673,16 +671,16 @@ def test_checknull(self, func):
673671

674672
def test_checknull_old(self):
675673
for value in na_vals + sometimes_na_vals:
676-
assert libmissing.checknull_old(value)
674+
assert libmissing.checknull(value, inf_as_na=True)
677675

678676
for value in inf_vals:
679-
assert libmissing.checknull_old(value)
677+
assert libmissing.checknull(value, inf_as_na=True)
680678

681679
for value in int_na_vals:
682-
assert not libmissing.checknull_old(value)
680+
assert not libmissing.checknull(value, inf_as_na=True)
683681

684682
for value in never_na_vals:
685-
assert not libmissing.checknull_old(value)
683+
assert not libmissing.checknull(value, inf_as_na=True)
686684

687685
def test_is_matching_na(self, nulls_fixture, nulls_fixture2):
688686
left = nulls_fixture

0 commit comments

Comments
 (0)