MAINT: Cleanup remaining PyUString_ConcatAndDel use. #17409
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
eric-wieser
reviewed
Oct 1, 2020
|
|
||
| PyObject *shape2 = convert_shape_to_string(ndim, shape, ""); |
There was a problem hiding this comment.
As a follow-up to this collection of PRs, its very temping to remove the third argument from this function
There was a problem hiding this comment.
Good idea. It doesn't get used and is easy enough to add elsewhere if needed.
eric-wieser
reviewed
Oct 1, 2020
numpy/core/src/umath/ufunc_object.c
Outdated
| if (doc == NULL) { | ||
| return NULL; | ||
| } | ||
| // FIXME: check if ufunc docstrings can/should be UTF-8 |
There was a problem hiding this comment.
I don't understand the quetion behind this comment - the PR hasn't changed anything, has it?
There was a problem hiding this comment.
Suggested change
| // FIXME: check if ufunc docstrings can/should be UTF-8 |
eric-wieser
approved these changes
Oct 1, 2020
The build_shape_string function is effectively a duplicate of the convert_shape_to_string function in common.c. All uses have now been replaced, so remove it.
charris
force-pushed
the
cleanup-remaining-PyUString-use
branch
from
18bd2da
to
e6030ff
Compare
seberg
approved these changes
Oct 2, 2020
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.
The
build_shape_stringfunction has also been removes as a duplicate ofconvert_shape_to_string.This should probably be squash merged.