diff options
| author | INADA Naoki <inada-n@klab.com> | 2014-10-10 17:52:31 +0900 |
|---|---|---|
| committer | INADA Naoki <inada-n@klab.com> | 2014-10-10 17:52:31 +0900 |
| commit | d826c6b89040d203b918e0b9e619975bc4a5c5ad (patch) | |
| tree | 7f2191c59a3da306e331e8e07d1790fe32c1d46e /tests/test_jwt.py | |
| parent | 126fde825937c4c1f488de6b1c57ef81428e9577 (diff) | |
| parent | 3dd1f45516424e8b2a2cf95cb02d71f37ca58b3e (diff) | |
| download | oauth2client-d826c6b89040d203b918e0b9e619975bc4a5c5ad.tar.gz | |
Merge remote-tracking branch 'origin/master' into python3
Conflicts:
oauth2client/client.py
Diffstat (limited to 'tests/test_jwt.py')
| -rw-r--r-- | tests/test_jwt.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_jwt.py b/tests/test_jwt.py index 6caf031..6cbbf4f 100644 --- a/tests/test_jwt.py +++ b/tests/test_jwt.py @@ -1,6 +1,6 @@ #!/usr/bin/python2.4 # -# Copyright 2010 Google Inc. +# Copyright 2014 Google Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import tempfile import time import unittest -from tests.http_mock import HttpMockSequence +from http_mock import HttpMockSequence from oauth2client import crypt from oauth2client.client import Credentials from oauth2client.client import SignedJwtAssertionCredentials @@ -189,7 +189,7 @@ class PEMCryptTestsPyCrypto(CryptTests): def setUp(self): self.format = 'pem' self.signer = crypt.PyCryptoSigner - self.verifier = crypt.OpenSSLVerifier + self.verifier = crypt.PyCryptoVerifier class PEMCryptTestsOpenSSL(CryptTests): |