BUG: Period.__eq__ numpy scalar (#44182 (comment)) #44285
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
mathause
commented
Nov 2, 2021
mathause
commented
- fixes BUG: np.timedelta64 + Period #44182 (comment)
- tests added / passed
- Ensure all linting tests pass, see here for how to run them
- whatsnew entry
|
I added three tests but only one of them fails without the code change. Fixed by the code update: Period("2000-01", "M") == np.array(0)Additional tests not affected by the code update: idx = period_range("2007-01", periods=20, freq="M")
idx == np.array(idx[10])
Period("2000-01", "M") == np.int_(0) |
jreback
requested changes
Nov 2, 2021
pandas/_libs/tslibs/period.pyx
Outdated
| @@ -1656,7 +1656,7 @@ cdef class _Period(PeriodMixin): | |||
| return PyObject_RichCompareBool(self.ordinal, other.ordinal, op) | |||
| elif other is NaT: | |||
| return _nat_scalar_rules[op] | |||
| elif util.is_array(other): | |||
| elif util.is_array(other) and not np.ndim(other) == 0: | |||
|
This used to return p = pd.Period("2000-01", "M")
p == np.array(p) |
jbrockmendel
reviewed
Nov 2, 2021
pandas/_libs/tslibs/period.pyx
Outdated
| @@ -1657,8 +1657,11 @@ cdef class _Period(PeriodMixin): | |||
| elif other is NaT: | |||
| return _nat_scalar_rules[op] | |||
| elif util.is_array(other): | |||
| # in particular ndarray[object]; see test_pi_cmp_period | |||
| return np.array([PyObject_RichCompare(self, x, op) for x in other]) | |||
| if np.ndim(other) > 0: | |||
There was a problem hiding this comment.
cnp.PyArray_IsZeroDim(other)
jbrockmendel
reviewed
Nov 2, 2021
| def test_comparison_numpy_scalar(self, scalar, expected): | ||
| p = Period("2000-01", "M") | ||
|
|
||
| for left, right in ((p, scalar), (scalar, p)): |
There was a problem hiding this comment.
the loop here is unnecessary; its two lines either way and clearer without
jbrockmendel
reviewed
Nov 2, 2021
| "scalar, expected", | ||
| ((np.array(0), False), (np.int_(0), False), (Period("2000-01", "M"), True)), | ||
| ) | ||
| def test_comparison_numpy_scalar(self, scalar, expected): |
There was a problem hiding this comment.
scalars are already tested; its zerodim we need to catch. in particular a zero-dim ndarray containing a Period object
jreback
approved these changes
Nov 4, 2021
|
thanks @mathause |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.