Fix issues with GceAssertionCredentials in Python 3 #254
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
|
CC: @aaltay, @tvalentyn, @markflyhigh |
charlesccychen
force-pushed
the
fix-gce-py3
branch
3 times, most recently
from
ebcc7e7 to
2917f22
Compare
charlesccychen
force-pushed
the
fix-gce-py3
branch
from
2917f22 to
3f3fca1
Compare
|
Hey @kevinli7, can you please review this change? Thanks! |
|
There is a test failure under Python 3.5: |
catleeball
reviewed
Feb 20, 2019
| with mock.patch.object(six.moves.urllib.request, 'build_opener', | ||
| return_value=opener, | ||
| autospec=True) as build_opener: | ||
| creds.GetServiceAccount('default') | ||
| creds.GetServiceAccount(b'default') |
There was a problem hiding this comment.
It looks like this might be at fault for the Python 3.5 regression mentioned in this comment.
Maybe something like this would help remedy the regression:
if six.PY2:
creds.GetServiceAccount(b'default')
else:
creds.GetServiceAccount('default')
There was a problem hiding this comment.
Marking this above comment "request changes", sorry I'm still a little new to the github workflow. 🙂
catleeball
suggested changes
Feb 20, 2019
| with mock.patch.object(six.moves.urllib.request, 'build_opener', | ||
| return_value=opener, | ||
| autospec=True) as build_opener: | ||
| creds.GetServiceAccount('default') | ||
| creds.GetServiceAccount(b'default') |
There was a problem hiding this comment.
Marking this above comment "request changes", sorry I'm still a little new to the github workflow. 🙂
udim
reviewed
Jul 30, 2019
| @@ -352,7 +352,7 @@ def _ScopesFromMetadataServer(self, scopes): | |||
| def GetServiceAccount(self, account): | |||
| relative_url = 'instance/service-accounts' | |||
| response = _GceMetadataRequest(relative_url) | |||
| response_lines = [line.rstrip('/\n\r') | |||
| response_lines = [line.rstrip(b'/\n\r').decode('utf-8') | |||
There was a problem hiding this comment.
Looks like #271 fixes this Py3 incompatibility, but not the one in _do_refresh_request below.
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.
This change fixes issues with GceAssertionCredentials in Python 3.