diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-04-15 12:57:03 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-04-15 12:57:03 -0400 |
| commit | 7fee3d69a5bc9954c3fe1e8cb6b4bef884319ac9 (patch) | |
| tree | 46351599010216cf825635577201cd4c9e5c3339 | |
| parent | 27c750de99df6818b5bc0414dd7995fb514f5c28 (diff) | |
| parent | b511ba8a45d4af2744b46161836a7998ff821bbc (diff) | |
| download | cryptography-7fee3d69a5bc9954c3fe1e8cb6b4bef884319ac9.tar.gz cryptography-7fee3d69a5bc9954c3fe1e8cb6b4bef884319ac9.tar.bz2 cryptography-7fee3d69a5bc9954c3fe1e8cb6b4bef884319ac9.zip | |
Merge pull request #1850 from reaperhulk/update-x509-repr
improve KeyUsage repr
| -rw-r--r-- | docs/x509.rst | 2 | ||||
| -rw-r--r-- | src/cryptography/x509.py | 4 | ||||
| -rw-r--r-- | tests/test_x509_ext.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/x509.rst b/docs/x509.rst index 19f7c405..512d940a 100644 --- a/docs/x509.rst +++ b/docs/x509.rst @@ -276,7 +276,7 @@ X.509 Certificate Object >>> for ext in cert.extensions: ... print(ext) <Extension(oid=<ObjectIdentifier(oid=2.5.29.14, name=subjectKeyIdentifier)>, critical=False, value=<SubjectKeyIdentifier(digest='X\x01\x84$\x1b\xbc+R\x94J=\xa5\x10r\x14Q\xf5\xaf:\xc9')>)> - <Extension(oid=<ObjectIdentifier(oid=2.5.29.15, name=keyUsage)>, critical=True, value=<KeyUsage(digital_signature=False, content_commitment=False, key_encipherment=False, data_encipherment=False, key_agreement=False, key_cert_sign=True, crl_sign=True, encipher_only=N/A, decipher_only=N/A)>)> + <Extension(oid=<ObjectIdentifier(oid=2.5.29.15, name=keyUsage)>, critical=True, value=<KeyUsage(digital_signature=False, content_commitment=False, key_encipherment=False, data_encipherment=False, key_agreement=False, key_cert_sign=True, crl_sign=True, encipher_only=None, decipher_only=None)>)> <Extension(oid=<ObjectIdentifier(oid=2.5.29.19, name=basicConstraints)>, critical=True, value=<BasicConstraints(ca=True, path_length=None)>)> X.509 CSR (Certificate Signing Request) Object diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index a9b6f8bd..b533b434 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -353,8 +353,8 @@ class KeyUsage(object): encipher_only = self.encipher_only decipher_only = self.decipher_only except ValueError: - encipher_only = "N/A" - decipher_only = "N/A" + encipher_only = None + decipher_only = None return ("<KeyUsage(digital_signature={0.digital_signature}, " "content_commitment={0.content_commitment}, " diff --git a/tests/test_x509_ext.py b/tests/test_x509_ext.py index acfe761d..9f98bce1 100644 --- a/tests/test_x509_ext.py +++ b/tests/test_x509_ext.py @@ -149,8 +149,8 @@ class TestKeyUsage(object): assert repr(ku) == ( "<KeyUsage(digital_signature=True, content_commitment=True, key_en" "cipherment=False, data_encipherment=False, key_agreement=False, k" - "ey_cert_sign=True, crl_sign=False, encipher_only=N/A, decipher_on" - "ly=N/A)>" + "ey_cert_sign=True, crl_sign=False, encipher_only=None, decipher_o" + "nly=None)>" ) def test_repr_key_agreement_true(self): |