Skip to content

CLN: some code cleanups to pandas/_libs/missing.pyx #32367

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 1 commit into from
Mar 3, 2020
Merged

CLN: some code cleanups to pandas/_libs/missing.pyx #32367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 12 additions & 18 deletions pandas/_libs/missing.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@ cnp.import_array()

cimport pandas._libs.util as util

from pandas._libs.tslibs.np_datetime cimport (
get_timedelta64_value, get_datetime64_value)

from pandas._libs.tslibs.np_datetime cimport get_datetime64_value, get_timedelta64_value
from pandas._libs.tslibs.nattype cimport (
checknull_with_nat, c_NaT as NaT, is_null_datetimelike)
c_NaT as NaT,
checknull_with_nat,
is_null_datetimelike,
)
from pandas._libs.ops_dispatch import maybe_dispatch_ufunc_to_dunder_op

from pandas.compat import is_platform_32bit
Expand Down Expand Up @@ -44,7 +47,7 @@ cpdef bint checknull(object val):

Returns
-------
result : bool
bool

Notes
-----
Expand Down Expand Up @@ -223,7 +226,7 @@ def isnaobj2d_old(arr: ndarray) -> ndarray:

Returns
-------
result : ndarray (dtype=np.bool_)
ndarray (dtype=np.bool_)
Copy link
Member

Choose a reason for hiding this comment

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

ndarray[bool]

Copy link
Member

Choose a reason for hiding this comment

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

@MomIsBestFriend can you update this


Notes
-----
Expand All @@ -248,17 +251,11 @@ def isnaobj2d_old(arr: ndarray) -> ndarray:


def isposinf_scalar(val: object) -> bool:
if util.is_float_object(val) and val == INF:
return True
else:
return False
return util.is_float_object(val) and val == INF


def isneginf_scalar(val: object) -> bool:
if util.is_float_object(val) and val == NEGINF:
return True
else:
return False
return util.is_float_object(val) and val == NEGINF


cdef inline bint is_null_datetime64(v):
Expand Down Expand Up @@ -423,7 +420,6 @@ class NAType(C_NAType):
return NA
elif isinstance(other, np.ndarray):
return np.where(other == 1, other, NA)

return NotImplemented

# Logical ops using Kleene logic
Expand All @@ -433,8 +429,7 @@ class NAType(C_NAType):
return False
elif other is True or other is C_NA:
return NA
else:
return NotImplemented
return NotImplemented

__rand__ = __and__

Expand All @@ -443,8 +438,7 @@ class NAType(C_NAType):
return True
elif other is False or other is C_NA:
return NA
else:
return NotImplemented
return NotImplemented

__ror__ = __or__

Expand Down