Py3k unicode cf #1830
Merged
Py3k unicode cf #1830
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
…uxcoord string datatype in Python 2.
|
Also pretty reasonable. Since it's only a partial change though, I'm not sure it's necessary to squash this one. |
No, I probably got carried away in the excitement of cut-and-paste. Is this good as-is, then ? |
| if np.issubdtype(variables[name].dtype, np.str): | ||
| result[name] = CFLabelVariable(name, variables[name]) | ||
| if _is_str_dtype(variables[name]): | ||
| var = variables[name] |
There was a problem hiding this comment.
I think maybe you meant to move this assignment outside the if to reduce the duplicate indexing?
No I didn't, but it looks like a good idea ! |
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.
A step towards an alternative version of #1782 which conserves existing Python 2 behaviour : see comment there
An adjusted version of @QuLogic "a02e863 py3k: Handle strings from netCDF consistently."
Decode to unicode only in Python 3.
TO TEST :
python3 -m unittest iris.tests.test_cffails before this, succeeds afterNOTE :
As the second commit effectively reverts some changes from the first one, it probably makes good sense to squish before merging.