Python 3 fixes - fix dirutil, fileutil, and xml_parser tests #6229
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-Arellano
commented
Jul 24, 2018
| @@ -149,7 +149,7 @@ class Dir(datatype(['path'])): | |||
| class File(datatype(['path', 'contents'])): | |||
| @classmethod | |||
| def empty(cls, path): | |||
| return cls(path, contents=b'') | |||
| return cls(path, contents='') | |||
There was a problem hiding this comment.
Throughout the tests for comparing trees, contents was being encoded as byte strings in the expected output. I'm not sure why - the tests pass when unicode in Py2, and the bytes present an issue when using Py3.
| @@ -396,7 +396,7 @@ def test_rm_rf_no_such_file_not_an_error(self, file_name='./vanishing_file'): | |||
| def test_readwrite_file(self): | |||
| with temporary_dir() as td: | |||
| test_filename = os.path.join(td, 'test.out') | |||
| test_content = '3333' | |||
| test_content = b'3333' | |||
There was a problem hiding this comment.
Must be bytes for safe_file_dump() and read_file() to work.
Eric-Arellano
changed the title
Eric-Arellano
changed the title
CMLivingston
pushed a commit
to CMLivingston/pants
that referenced
this pull request
Aug 27, 2018
…ild#6229) ### Problem Dirutil tests failing due to unicode vs bytes. `dirutil.py` itself is fine. I decided `safe_file_dump()` and `read_file()` should still work with bytes, not unicode. ### Related PRs To get completely green on Py3, requires pantsbuild#6226 and pantsbuild#6228. This can be merged before them both, though, as it shouldn't break Py2 and we aren't running Py3 yet.
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.
Problem
Dirutil tests failing due to unicode vs bytes.
dirutil.pyitself is fine. I decidedsafe_file_dump()andread_file()should still work with bytes, not unicode.Related PRs
To get completely green on Py3, requires #6226 and #6228. This can be merged before them both, though, as it shouldn't break Py2 and we aren't running Py3 yet.