diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-07-07 15:15:05 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-07-07 15:15:05 -0500 |
| commit | 965dbbe2301c667b51e310b503bd25cfa5a3bac3 (patch) | |
| tree | f1c1275dd315d8debcee7887b4d06f9ce5083490 | |
| parent | cc5d1bf129c7e1a41906101fd1cb142b74765303 (diff) | |
| download | cryptography-965dbbe2301c667b51e310b503bd25cfa5a3bac3.tar.gz cryptography-965dbbe2301c667b51e310b503bd25cfa5a3bac3.tar.bz2 cryptography-965dbbe2301c667b51e310b503bd25cfa5a3bac3.zip | |
change some nomenclature
| -rw-r--r-- | cryptography/exceptions.py | 2 | ||||
| -rw-r--r-- | cryptography/hazmat/backends/multibackend.py | 4 | ||||
| -rw-r--r-- | tests/hazmat/backends/test_multibackend.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cryptography/exceptions.py b/cryptography/exceptions.py index 3ccfaf51..c14763f7 100644 --- a/cryptography/exceptions.py +++ b/cryptography/exceptions.py @@ -22,7 +22,7 @@ class _Reasons(object): UNSUPPORTED_MGF = object() UNSUPPORTED_PUBLIC_KEY_ALGORITHM = object() UNSUPPORTED_ELLIPTIC_CURVE = object() - UNSUPPORTED_KEY_FORMAT = object() + UNSUPPORTED_SERIALIZATION = object() class UnsupportedAlgorithm(Exception): diff --git a/cryptography/hazmat/backends/multibackend.py b/cryptography/hazmat/backends/multibackend.py index c06d2431..6182f5cf 100644 --- a/cryptography/hazmat/backends/multibackend.py +++ b/cryptography/hazmat/backends/multibackend.py @@ -312,6 +312,6 @@ class MultiBackend(object): continue raise UnsupportedAlgorithm( - "This backend does not support this key format.", - _Reasons.UNSUPPORTED_KEY_FORMAT + "This backend does not support this key serialization.", + _Reasons.UNSUPPORTED_SERIALIZATION ) diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py index 19795634..3be8371f 100644 --- a/tests/hazmat/backends/test_multibackend.py +++ b/tests/hazmat/backends/test_multibackend.py @@ -484,5 +484,5 @@ class TestMultiBackend(object): backend.load_pkcs8_pem_private_key(b"keydata", None) backend = MultiBackend([]) - with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_KEY_FORMAT): + with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_SERIALIZATION): backend.load_pkcs8_pem_private_key(b"keydata", None) |