diff options
author | Danny Hermes <daniel.j.hermes@gmail.com> | 2015-08-19 22:03:50 -0700 |
---|---|---|
committer | Danny Hermes <daniel.j.hermes@gmail.com> | 2015-08-21 08:04:14 -0700 |
commit | 34c1ff543dd16edf58dcf5b336076cf27de3721a (patch) | |
tree | c4bfda94143239939a56cec584a5c707b87bcced /tests/test_crypt.py | |
parent | 043e066e54d00bd3f8c5a90d2cb83292f30f8ede (diff) | |
download | oauth2client-34c1ff543dd16edf58dcf5b336076cf27de3721a.tar.gz |
Raw pep8ify changes.
Simply ran
pep8ify -w oauth2client/
pep8ify -w tests/
Diffstat (limited to 'tests/test_crypt.py')
-rw-r--r-- | tests/test_crypt.py | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/tests/test_crypt.py b/tests/test_crypt.py index 53b91c2..bd2c105 100644 --- a/tests/test_crypt.py +++ b/tests/test_crypt.py @@ -18,10 +18,10 @@ import sys import unittest try: - reload + reload except NameError: - # For Python3 (though importlib should be used, silly 3.3). - from imp import reload + # For Python3 (though importlib should be used, silly 3.3). + from imp import reload from oauth2client import _helpers from oauth2client.client import HAS_OPENSSL @@ -30,44 +30,44 @@ from oauth2client import crypt def datafile(filename): - f = open(os.path.join(os.path.dirname(__file__), 'data', filename), 'rb') - data = f.read() - f.close() - return data + f = open(os.path.join(os.path.dirname(__file__), 'data', filename), 'rb') + data = f.read() + f.close() + return data class Test_pkcs12_key_as_pem(unittest.TestCase): - def _make_signed_jwt_creds(self, private_key_file='privatekey.p12', + def _make_signed_jwt_creds(self, private_key_file='privatekey.p12', private_key=None): - private_key = private_key or datafile(private_key_file) - return SignedJwtAssertionCredentials( + private_key = private_key or datafile(private_key_file) + return SignedJwtAssertionCredentials( 'some_account@example.com', private_key, scope='read+write', sub='joe@example.org') - def _succeeds_helper(self, password=None): - self.assertEqual(True, HAS_OPENSSL) + def _succeeds_helper(self, password=None): + self.assertEqual(True, HAS_OPENSSL) - credentials = self._make_signed_jwt_creds() - if password is None: - password = credentials.private_key_password - pem_contents = crypt.pkcs12_key_as_pem(credentials.private_key, password) - pkcs12_key_as_pem = datafile('pem_from_pkcs12.pem') - pkcs12_key_as_pem = _helpers._parse_pem_key(pkcs12_key_as_pem) - alternate_pem = datafile('pem_from_pkcs12_alternate.pem') - self.assertTrue(pem_contents in [pkcs12_key_as_pem, alternate_pem]) + credentials = self._make_signed_jwt_creds() + if password is None: + password = credentials.private_key_password + pem_contents = crypt.pkcs12_key_as_pem(credentials.private_key, password) + pkcs12_key_as_pem = datafile('pem_from_pkcs12.pem') + pkcs12_key_as_pem = _helpers._parse_pem_key(pkcs12_key_as_pem) + alternate_pem = datafile('pem_from_pkcs12_alternate.pem') + self.assertTrue(pem_contents in [pkcs12_key_as_pem, alternate_pem]) - def test_succeeds(self): - self._succeeds_helper() + def test_succeeds(self): + self._succeeds_helper() - def test_succeeds_with_unicode_password(self): - password = u'notasecret' - self._succeeds_helper(password) + def test_succeeds_with_unicode_password(self): + password = u'notasecret' + self._succeeds_helper(password) - def test_with_nonsense_key(self): - from OpenSSL import crypto - credentials = self._make_signed_jwt_creds(private_key=b'NOT_A_KEY') - self.assertRaises(crypto.Error, crypt.pkcs12_key_as_pem, + def test_with_nonsense_key(self): + from OpenSSL import crypto + credentials = self._make_signed_jwt_creds(private_key=b'NOT_A_KEY') + self.assertRaises(crypto.Error, crypt.pkcs12_key_as_pem, credentials.private_key, credentials.private_key_password) |