Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decode python_eval template resource as utf-8. #6379

Merged
merged 2 commits into from
Aug 22, 2018
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/python/pants/invalidation/build_invalidator.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def _read_sha(self, cache_key):
def _read_sha_by_id(self, id):
try:
with open(self._sha_file_by_id(id), 'rb') as fd:
return fd.read().strip()
return fd.read().strip().decode('utf-8')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Preferred to open in mode 'r', and then you can avoid the decode. Don't worry about fixing and repushing though - https://github.com/pantsbuild/pants/pull/6372/files#diff-0bfcef172d3faad2ba6f85c7330adae2R225 will fix it.

Thanks again John for your help here!

except IOError as e:
if e.errno != errno.ENOENT:
raise
Expand Down