From f5de2afe670b12ed9ac9d99e20f86e71896f103d Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Fri, 10 Oct 2014 18:36:09 +0900 Subject: [PATCH] Fix some trivial issues. --- oauth2client/client.py | 2 +- oauth2client/crypt.py | 6 ++++-- tests/test_jwt.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/oauth2client/client.py b/oauth2client/client.py index 174e13e..4c8af28 100644 --- a/oauth2client/client.py +++ b/oauth2client/client.py @@ -1396,7 +1396,7 @@ class SignedJwtAssertionCredentials(AssertionCredentials): def _generate_assertion(self): """Generate the assertion that will be used in the request.""" - now = long(time.time()) + now = int(time.time()) payload = { 'aud': self.token_uri, 'scope': self.scope, diff --git a/oauth2client/crypt.py b/oauth2client/crypt.py index 67b75b9..1c5748e 100644 --- a/oauth2client/crypt.py +++ b/oauth2client/crypt.py @@ -191,8 +191,10 @@ try: Verifier instance. """ if is_x509_cert: - pemLines = key_pem.replace(' ', '').split() - certDer = _urlsafe_b64decode(''.join(pemLines[1:-1])) + if isinstance(key_pem, six.text_type): + key_pem = key_pem.encode('ascii') + pemLines = key_pem.replace(b' ', b'').split() + certDer = _urlsafe_b64decode(b''.join(pemLines[1:-1])) certSeq = DerSequence() certSeq.decode(certDer) tbsSeq = DerSequence() diff --git a/tests/test_jwt.py b/tests/test_jwt.py index 6cbbf4f..169e5f8 100644 --- a/tests/test_jwt.py +++ b/tests/test_jwt.py @@ -28,7 +28,7 @@ import tempfile import time import unittest -from http_mock import HttpMockSequence +from .http_mock import HttpMockSequence from oauth2client import crypt from oauth2client.client import Credentials from oauth2client.client import SignedJwtAssertionCredentials