Skip to content

CLN: de-duplicate numeric type check in _libs/testing #36625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 6, 2020
Merged

CLN: de-duplicate numeric type check in _libs/testing #36625

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d36ef84
implement is_real_number_object
arw2019 Sep 25, 2020
1228b6e
use is_real_number_object in testing.pyx
arw2019 Sep 25, 2020
b854916
rename is_comparable_as_number -> is_comparable_as_real_number
arw2019 Sep 25, 2020
88e165d
linting
arw2019 Sep 25, 2020
6bc5677
Merge remote-tracking branch 'upstream/master' into testing-cln
arw2019 Sep 25, 2020
855c91e
feedback: add missing newline
arw2019 Sep 25, 2020
cabec1f
Merge remote-tracking branch 'upstream/master' into testing-cln
arw2019 Sep 26, 2020
19016fa
fix imports
arw2019 Sep 26, 2020
aaef028
feedback: use imported func directly
arw2019 Sep 26, 2020
41a0da1
Merge branch 'master' into testing-cln
arw2019 Oct 5, 2020
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
30 changes: 7 additions & 23 deletions pandas/_libs/testing.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,17 @@ from numpy cimport import_array

import_array()

from pandas._libs.util cimport is_array
from pandas._libs.util cimport (
is_array,
is_real_number_object,
)

from pandas.core.dtypes.common import is_dtype_equal
from pandas.core.dtypes.missing import array_equivalent, isna


cdef NUMERIC_TYPES = (
bool,
int,
float,
np.bool_,
np.int8,
np.int16,
np.int32,
np.int64,
np.uint8,
np.uint16,
np.uint32,
np.uint64,
np.float16,
np.float32,
np.float64,
)


cdef bint is_comparable_as_number(obj):
return isinstance(obj, NUMERIC_TYPES)
cdef bint is_comparable_as_real_number(obj):
Copy link
Contributor

Choose a reason for hiding this comment

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

is wouldn't even do this, just use the imported one directly.

Copy link
Member

Choose a reason for hiding this comment

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

not a huge deal, but unless we expect to use it elsewhere, id rather this new func live here rather than in util; otherwise it gets re-compiled into basically every cython module.

return is_real_number_object(obj)


cdef bint isiterable(obj):
Expand Down Expand Up @@ -198,7 +182,7 @@ cpdef assert_almost_equal(a, b,
# object comparison
return True

if is_comparable_as_number(a) and is_comparable_as_number(b):
if is_comparable_as_real_number(a) and is_comparable_as_real_number(b):
if array_equivalent(a, b, strict_nan=True):
# inf comparison
return True
Expand Down
4 changes: 4 additions & 0 deletions pandas/_libs/tslibs/util.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ cdef inline bint is_bool_object(object obj) nogil:
PyObject_TypeCheck(obj, &PyBoolArrType_Type))


cdef inline bint is_real_number_object(object obj) nogil:
return is_bool_object(obj) or is_integer_object(obj) or is_float_object(obj)


cdef inline bint is_timedelta64_object(object obj) nogil:
"""
Cython equivalent of `isinstance(val, np.timedelta64)`
Expand Down