Fix creation of string arrays from object types #3491
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
| PyObject *scalar = PyArray_ToList(data_obj); | ||
| if (scalar != NULL) { | ||
| PyObject *s = PyObject_Str(scalar); | ||
| if (s != NULL) { |
There was a problem hiding this comment.
If s is NULL, though, don't we need to propagate the exception?
|
Added PyObject_Str exception handling |
| else if (PyArray_Check(data_obj)) { | ||
| /* | ||
| * Convert data array to list of objects since | ||
| * GetArrayParamsFromObject won't iterator over |
|
Looks good apart from some style nitpicks. |
| if (discover_itemsize(op, *out_ndim, &itemsize) < 0) { | ||
| int size_as_string = 0; | ||
| if ((*out_dtype)->type_num == NPY_STRING || | ||
| (*out_dtype)->type_num == NPY_UNICODE) { |
There was a problem hiding this comment.
Indent reversed ;) The logical part should have the extra indent.
|
The commit messages should have the relevant acronyms. etc. Might want to compress the commits after this is done. |
|
Merged. Thanks. |
charris
added a commit
that referenced
this pull request
Jul 8, 2013
Fix creation of string arrays from object types
Merged
jayvius
added a commit
to ContinuumIO/numpy
that referenced
this pull request
Sep 18, 2013
Don't convert unicode string to ascii string before getting byte length. Also, get length of non string type as ascii or unicode depending on output string type.
charris
pushed a commit
to charris/numpy
that referenced
this pull request
Sep 19, 2013
Don't convert unicode string to ascii string before getting byte length. Also, get length of non string type as ascii or unicode depending on output string type.
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 issue #3398