Py3k unicode nimrod #1829
Merged
Py3k unicode nimrod #1829
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
|
Looks reasonable. |
@QuLogic - are you happy to merge? |
|
I wasn't sure if @pp-mo still wanted to squash this one. |
pp-mo
force-pushed
the
py3k-unicode-nimrod
branch
from
d60f7b4 to
fa4cb59
Compare
|
Ok, done that - I think on balance it's worth having a less-confusing history. |
|
I do not know why the build has started failing. |
|
I think this is a recently merged change that has gone bad on us. |
Merged
|
This makes sense to me and I can't see any unresolved feedback so I'm going to merge. |
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 "199bec1 py3k: Decode strings from NIMROD files."
Only decode the strings in Python 3.
TO TEST :
python3 -m unittest iris.tests.test_nimrodfails 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.