aboutsummaryrefslogtreecommitdiff
path: root/oauth2client/crypt.py
diff options
context:
space:
mode:
authorDanny Hermes <daniel.j.hermes@gmail.com>2015-08-25 16:30:57 -0700
committerDanny Hermes <daniel.j.hermes@gmail.com>2015-09-01 09:58:33 -0700
commit4c56131ea2966c6772d47fb1020bbf899ff8d3bf (patch)
tree8a66336ac83feb3da7e6a73d4eb449ee9275cf9f /oauth2client/crypt.py
parent5dda03224fbb408fbb3ac450733b997b525496c6 (diff)
downloadoauth2client-4c56131ea2966c6772d47fb1020bbf899ff8d3bf.tar.gz
Adding no cover pragmas to test_crypt.
Also defining the fallback pkcs12_key_as_pem as a top-level method so that we may test it.
Diffstat (limited to 'oauth2client/crypt.py')
-rw-r--r--oauth2client/crypt.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/oauth2client/crypt.py b/oauth2client/crypt.py
index de62e06..f36d18d 100644
--- a/oauth2client/crypt.py
+++ b/oauth2client/crypt.py
@@ -34,24 +34,26 @@ logger = logging.getLogger(__name__)
class AppIdentityError(Exception):
- pass
+ """Error to indicate crypto failure."""
+
+
+def _bad_pkcs12_key_as_pem(*args, **kwargs):
+ raise NotImplementedError('pkcs12_key_as_pem requires OpenSSL.')
try:
from oauth2client._openssl_crypt import OpenSSLVerifier
from oauth2client._openssl_crypt import OpenSSLSigner
from oauth2client._openssl_crypt import pkcs12_key_as_pem
-except ImportError:
+except ImportError: # pragma: NO COVER
OpenSSLVerifier = None
OpenSSLSigner = None
-
- def pkcs12_key_as_pem(*args, **kwargs):
- raise NotImplementedError('pkcs12_key_as_pem requires OpenSSL.')
+ pkcs12_key_as_pem = _bad_pkcs12_key_as_pem
try:
from oauth2client._pycrypto_crypt import PyCryptoVerifier
from oauth2client._pycrypto_crypt import PyCryptoSigner
-except ImportError:
+except ImportError: # pragma: NO COVER
PyCryptoVerifier = None
PyCryptoSigner = None
@@ -59,10 +61,10 @@ except ImportError:
if OpenSSLSigner:
Signer = OpenSSLSigner
Verifier = OpenSSLVerifier
-elif PyCryptoSigner:
+elif PyCryptoSigner: # pragma: NO COVER
Signer = PyCryptoSigner
Verifier = PyCryptoVerifier
-else:
+else: # pragma: NO COVER
raise ImportError('No encryption library found. Please install either '
'PyOpenSSL, or PyCrypto 2.6 or later')