MAINT: Move np.dtype.name.__get__ to python
#11932
Merged
Conversation
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
eric-wieser
commented
Sep 12, 2018
| res = PyUString_FromString(typeobj->tp_name); | ||
| } | ||
| else { | ||
| res = PyUString_FromStringAndSize(s + 1, strlen(s) - 1); |
There was a problem hiding this comment.
This entire block is just typeobj.__name__
eric-wieser
commented
Sep 12, 2018
| return dtype.type.__name__ | ||
|
|
||
| # Builtin classes are documented as returning a "bit name" | ||
| name = dtype.type.__name__ |
There was a problem hiding this comment.
This line blocks #10151, but so did the equivalent C code
eric-wieser
commented
Sep 12, 2018
|
|
||
| # append bit counts to str, unicode, and void | ||
| if np.issubdtype(dtype, np.flexible) and not _isunsized(dtype): | ||
| name += "{}".format(dtype.itemsize * 8) |
There was a problem hiding this comment.
@charris: As predicted, the assumption that a byte is 8 bits is pretty ingrained into our dtype string handling
This shares a lot of code with part of `dtype.__repr__`, and it's helpful to get it all in one place. This fixes possible but unlikely segfaults if `PyUString_ConcatAndDel` fails.
9196cd7 to
5cba7ca
Compare
charris
reviewed
Sep 13, 2018
| const int np_prefix_len = sizeof(np_prefix) - 1; | ||
| PyTypeObject *typeobj = self->typeobj; | ||
| /* let python handle this */ | ||
| PyObject *_numpy_dtype; |
There was a problem hiding this comment.
Shouldn't this be static PyObject *_numpy_dtype = NULL; It needs to stay around and needs to be initialized.
There was a problem hiding this comment.
I don't think it does need to stay around, and it's initialized at its first use below.
This matches dtype.__repr__, in that both do not bother to cache the module or the function
|
Thanks Eric. |
np.dtype.name.__get__ to python
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.
This shares a lot of code with part of
dtype.__repr__, and it's helpful to get it all in one place.This fixes possible but unlikely segfaults if
PyUString_ConcatAndDelfails.Follows up on some remarks left in #10602, hopefully makes it easier to solve problems in #10151.