Skip to content

Ensure unicode strings for Python 2 / 3 compat #269

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 5, 2019
Merged

Ensure unicode strings for Python 2 / 3 compat #269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
365fc48
Ensure unicode strings for Python 2 / 3 compat
Jun 4, 2019
9b55f2e
Remove unicode import, explicit unicode string
catleeball Jun 5, 2019
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
9 changes: 6 additions & 3 deletions apitools/base/py/credentials_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,9 @@ def __init__(self, scopes=None, service_account_name='default', **kwds):
# identified these scopes in the same execution. However, the
# available scopes don't change once an instance is created,
# so there is no reason to perform more than one query.
self.__service_account_name = service_account_name
self.__service_account_name = six.ensure_text(
service_account_name,
encoding='utf-8',)
cached_scopes = None
cache_filename = kwds.get('cache_filename')
if cache_filename:
Expand Down Expand Up @@ -317,7 +319,8 @@ def _WriteCacheFile(self, cache_filename, scopes):
scopes: Scopes for the desired credentials.
"""
# Credentials metadata dict.
creds = {'scopes': sorted(list(scopes)),
scopes = sorted([six.ensure_text(scope) for scope in scopes])
creds = {'scopes': scopes,
'svc_acct_name': self.__service_account_name}
creds_str = json.dumps(creds)
cache_file = _MultiProcessCacheFile(cache_filename)
Expand Down Expand Up @@ -352,7 +355,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 = [six.ensure_text(line).rstrip(u'/\n\r')
for line in response.readlines()]
return account in response_lines

Expand Down