Skip to content

Python3 #1

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

Open
zegkljan wants to merge 5 commits into
base: python3
Choose a base branch
from
Open

Python3 #1

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4c5b7d
Convert the request result content to str.
zegkljan Jul 12, 2014
6c86795
Fixed a bytes/str related issue.
zegkljan Jul 12, 2014
84ce1c7
Merge remote-tracking branch 'upstream/python3' into python3
zegkljan Jul 19, 2014
c06ce51
Bytes/str issue fixed to work in python 2.6.
zegkljan Jul 20, 2014
a8381ff
Removed forgotten __future__ import.
zegkljan Jul 20, 2014
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
7 changes: 5 additions & 2 deletions oauth2client/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,8 +1405,10 @@ def verify_id_token(id_token, audience, http=None,
def _urlsafe_b64decode(b64string):
# Guard against unicode strings, which base64 can't handle.
b64string = b64string.encode('ascii')
padded = b64string + '=' * (4 - len(b64string) % 4)
return base64.urlsafe_b64decode(padded)
padded = b64string + b'=' * (4 - len(b64string) % 4)
decoded = base64.urlsafe_b64decode(padded)
decoded = bytes.decode(decoded)
return decoded


def _extract_id_token(id_token):
Expand Down Expand Up @@ -1682,6 +1684,7 @@ def step2_exchange(self, code, http=None):

resp, content = http.request(self.token_uri, method='POST', body=body,
headers=headers)
content = bytes.decode(content)
d = _parse_exchange_token_response(content)
if resp.status == 200 and 'access_token' in d:
access_token = d['access_token']
Expand Down