bpo-35021: Fixes assertion failures in _datetimemodule.c #10039
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
Fixes assertion failures in _datetimemodule.c introduced in the previous fix. Rather of trying to handle an int subclass as exact int, let it to use overridden special methods, but check the result of divmod().
serhiy-storchaka
added
type-bug
gpshead
reviewed
Oct 22, 2018
| @@ -2309,13 +2315,11 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor, | |||
| assert(num != NULL); | |||
|
|
|||
| if (PyLong_Check(num)) { | |||
| prod = PyNumber_Multiply(factor, num); | |||
| prod = PyNumber_Multiply(num, factor); | |||
There was a problem hiding this comment.
same comment as the other PR: add a comment on the PyNumber_Multiply calls describing why the order might matter.
There was a problem hiding this comment.
The order doesn't matter now. I just restore the order prior to bpo-31752 changes.
|
This looks good to me, and seems like the most sensible approach. |
|
Although #10040 is closer to the Python implementation. |
vstinner
changed the title
|
Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Nov 20, 2018
Fixes assertion failures in _datetimemodule.c introduced in the previous fix (see bpo-31752). Rather of trying to handle an int subclass as exact int, let it to use overridden special methods, but check the result of divmod(). (cherry picked from commit 3ec0f49) Co-authored-by: Serhiy Storchaka <[email protected]>
|
GH-10614 is a backport of this pull request to the 3.7 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Nov 20, 2018
Fixes assertion failures in _datetimemodule.c introduced in the previous fix (see bpo-31752). Rather of trying to handle an int subclass as exact int, let it to use overridden special methods, but check the result of divmod(). (cherry picked from commit 3ec0f49) Co-authored-by: Serhiy Storchaka <[email protected]>
|
GH-10615 is a backport of this pull request to the 3.6 branch. |
|
Sorry, @serhiy-storchaka, I could not cleanly backport this to |
miss-islington
added a commit
that referenced
this pull request
Nov 20, 2018
Fixes assertion failures in _datetimemodule.c introduced in the previous fix (see bpo-31752). Rather of trying to handle an int subclass as exact int, let it to use overridden special methods, but check the result of divmod(). (cherry picked from commit 3ec0f49) Co-authored-by: Serhiy Storchaka <[email protected]>
miss-islington
added a commit
that referenced
this pull request
Nov 20, 2018
Fixes assertion failures in _datetimemodule.c introduced in the previous fix (see bpo-31752). Rather of trying to handle an int subclass as exact int, let it to use overridden special methods, but check the result of divmod(). (cherry picked from commit 3ec0f49) Co-authored-by: Serhiy Storchaka <[email protected]>
serhiy-storchaka
added a commit
to serhiy-storchaka/cpython
that referenced
this pull request
Nov 20, 2018
…GH-10039) Fixes assertion failures in _datetimemodule.c introduced in the previous fix (see bpo-31752). Rather of trying to handle an int subclass as exact int, let it to use overridden special methods, but check the result of divmod().. (cherry picked from commit 3ec0f49) Co-authored-by: Serhiy Storchaka <[email protected]>
|
GH-10617 is a backport of this pull request to the 2.7 branch. |
serhiy-storchaka
added a commit
that referenced
this pull request
Nov 20, 2018
…) (GH-10617) Fixes assertion failures in _datetimemodule.c introduced in the previous fix (see bpo-31752). Rather of trying to handle an int subclass as exact int, let it to use overridden special methods, but check the result of divmod(). (cherry picked from commit 3ec0f49) Co-authored-by: Serhiy Storchaka <[email protected]>
|
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.
Fixes assertion failures in _datetimemodule.c
introduced in the previous fix (bpo-31752).
Rather of trying to handle an int subclass as exact int,
let it to use overridden special methods, but check the
result of divmod().
https://bugs.python.org/issue35021