Merge pull request #1711 from reaperhulk/serialize-format-private-format

s/Format/PrivateFormat

2 files changed, 7 insertions, 5 deletions

diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py
index ce11f6cb..de653032 100644
--- a/src/cryptography/hazmat/backends/openssl/backend.py
+++ b/src/cryptography/hazmat/backends/openssl/backend.py
@@ -1098,17 +1098,19 @@ class Backend(object):
         if not isinstance(encoding, serialization.Encoding):
             raise TypeError("encoding must be an item from the Encoding enum")
 
-        if not isinstance(format, serialization.Format):
-            raise TypeError("format must be an item from the Format enum")
+        if not isinstance(format, serialization.PrivateFormat):
+            raise TypeError(
+                "format must be an item from the PrivateFormat enum"
+            )
 
         # This is a temporary check until we land DER serialization.
         if encoding is not serialization.Encoding.PEM:
             raise ValueError("Only PEM encoding is supported by this backend")
 
-        if format is serialization.Format.PKCS8:
+        if format is serialization.PrivateFormat.PKCS8:
             write_bio = self._lib.PEM_write_bio_PKCS8PrivateKey
             key = evp_pkey
-        elif format is serialization.Format.TraditionalOpenSSL:
+        elif format is serialization.PrivateFormat.TraditionalOpenSSL:
             write_bio = traditional_write_func
             key = cdata
 
diff --git a/src/cryptography/hazmat/primitives/serialization.py b/src/cryptography/hazmat/primitives/serialization.py
index 0d564221..7e363198 100644
--- a/src/cryptography/hazmat/primitives/serialization.py
+++ b/src/cryptography/hazmat/primitives/serialization.py
@@ -174,7 +174,7 @@ class Encoding(Enum):
     DER = "DER"
 
 
-class Format(Enum):
+class PrivateFormat(Enum):
     PKCS8 = "PKCS8"
     TraditionalOpenSSL = "TraditionalOpenSSL"