commit 965dbbe2301c667b51e310b503bd25cfa5a3bac3
author Paul Kehrer <paul.l.kehrer@gmail.com> Mon Jul 07 15:15:05 2014 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Mon Jul 07 15:15:05 2014 -0500
tree f1c1275dd315d8debcee7887b4d06f9ce5083490
parent cc5d1bf129c7e1a41906101fd1cb142b74765303

change some nomenclature

cryptography/exceptions.py

diff --git a/cryptography/exceptions.py b/cryptography/exceptions.py
index 3ccfaf5..c14763f 100644
--- a/cryptography/exceptions.py
+++ b/cryptography/exceptions.py
@@ -22,7 +22,7 @@
     UNSUPPORTED_MGF = object()
     UNSUPPORTED_PUBLIC_KEY_ALGORITHM = object()
     UNSUPPORTED_ELLIPTIC_CURVE = object()
-    UNSUPPORTED_KEY_FORMAT = object()
+    UNSUPPORTED_SERIALIZATION = object()
 
 
 class UnsupportedAlgorithm(Exception):

cryptography/hazmat/backends/multibackend.py

diff --git a/cryptography/hazmat/backends/multibackend.py b/cryptography/hazmat/backends/multibackend.py
index c06d243..6182f5c 100644
--- a/cryptography/hazmat/backends/multibackend.py
+++ b/cryptography/hazmat/backends/multibackend.py
@@ -312,6 +312,6 @@
                 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
         )

tests/hazmat/backends/test_multibackend.py

diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py
index 1979563..3be8371 100644
--- a/tests/hazmat/backends/test_multibackend.py
+++ b/tests/hazmat/backends/test_multibackend.py
@@ -484,5 +484,5 @@
         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)