ENH: review return values for PyArray_DescrNew#20984
Merged
charris merged 1 commit intonumpy:maintenance/1.22.xfrom Feb 3, 2022
Merged
ENH: review return values for PyArray_DescrNew#20984charris merged 1 commit intonumpy:maintenance/1.22.xfrom
charris merged 1 commit intonumpy:maintenance/1.22.xfrom
Conversation
* ENH: review return value from PyArray_DescrNew* calls * BUG: remove unused variable * BUG: typo * Update numpy/core/src/multiarray/methods.c Co-authored-by: Sebastian Berg <sebastian@sipsolutions.net> * Update numpy/core/src/multiarray/methods.c Co-authored-by: Sebastian Berg <sebastian@sipsolutions.net> * Update numpy/core/src/multiarray/getset.c Co-authored-by: Sebastian Berg <sebastian@sipsolutions.net> * Update numpy/core/src/multiarray/methods.c Co-authored-by: Sebastian Berg <sebastian@sipsolutions.net> * fixes from review * Update numpy/core/src/umath/ufunc_type_resolution.c Co-authored-by: Sebastian Berg <sebastian@sipsolutions.net> * move check to internal function * remove check * Remove unnecessary dealloc The dealloc is now part of the Py_DECREF(ret) and handled there. Doing it here would decref it twice. * MAINT: Remove custom error message (and small cleanup) It is probably not good to call PyObject_GetIter() if dtype is NULL and an error is already in progress... (If we check for it, lets try to do it right.) * Fixup DescrNewFromType `DescrNewFromType` cannot fail in most cases, but if it does, DescrNew does not accept NULL as input. Co-authored-by: Sebastian Berg <sebastian@sipsolutions.net>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Backport of #20960.
ENH: review return value from PyArray_DescrNew* calls
BUG: remove unused variable
BUG: typo
Update numpy/core/src/multiarray/methods.c
Co-authored-by: Sebastian Berg sebastian@sipsolutions.net
Co-authored-by: Sebastian Berg sebastian@sipsolutions.net
Co-authored-by: Sebastian Berg sebastian@sipsolutions.net
Co-authored-by: Sebastian Berg sebastian@sipsolutions.net
fixes from review
Update numpy/core/src/umath/ufunc_type_resolution.c
Co-authored-by: Sebastian Berg sebastian@sipsolutions.net
move check to internal function
remove check
Remove unnecessary dealloc
The dealloc is now part of the Py_DECREF(ret) and handled there.
Doing it here would decref it twice.
It is probably not good to call PyObject_GetIter() if dtype is NULL
and an error is already in progress...
(If we check for it, lets try to do it right.)
DescrNewFromTypecannot fail in most cases, but if it does,DescrNew does not accept NULL as input.
Co-authored-by: Sebastian Berg sebastian@sipsolutions.net