diff options
| author | Hynek Schlawack <hs@ox.cx> | 2016-02-07 09:09:20 +0100 |
|---|---|---|
| committer | Hynek Schlawack <hs@ox.cx> | 2016-02-07 09:09:20 +0100 |
| commit | 0c741a55b28b84afad3c09f6e36d563b12070e3e (patch) | |
| tree | 1dc763ac708feef05199f0a38378e6dfa0ed3aa9 /src | |
| parent | 39dc1331084270dc94f7c3bfb684ae4e39f746ec (diff) | |
| parent | 0639db99c916e61ac8ee2687c4a9d37c7c67ba76 (diff) | |
| download | cryptography-0c741a55b28b84afad3c09f6e36d563b12070e3e.tar.gz cryptography-0c741a55b28b84afad3c09f6e36d563b12070e3e.tar.bz2 cryptography-0c741a55b28b84afad3c09f6e36d563b12070e3e.zip | |
Merge pull request #2713 from alex/silence-warning
Fixes #2710 -- silence a deprecation warning.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/x509/__init__.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/cryptography/x509/__init__.py b/src/cryptography/x509/__init__.py index a1deb7f4..787f1a60 100644 --- a/src/cryptography/x509/__init__.py +++ b/src/cryptography/x509/__init__.py @@ -4,6 +4,7 @@ from __future__ import absolute_import, division, print_function +from cryptography import utils from cryptography.x509.base import ( Certificate, CertificateBuilder, CertificateRevocationList, CertificateRevocationListBuilder, @@ -30,12 +31,19 @@ from cryptography.x509.general_name import ( ) from cryptography.x509.name import Name, NameAttribute from cryptography.x509.oid import ( - AuthorityInformationAccessOID, CRLEntryExtensionOID, CRLExtensionOID, + AuthorityInformationAccessOID, CRLEntryExtensionOID, CertificatePoliciesOID, ExtendedKeyUsageOID, ExtensionOID, NameOID, ObjectIdentifier, SignatureAlgorithmOID, _SIG_OIDS_TO_HASH ) +CRLExtensionOID = utils.deprecated( + CRLEntryExtensionOID, + __name__, + "CRLExtensionOID has been renamed to CRLEntryExtensionOID", + utils.DeprecatedIn12 +) + OID_AUTHORITY_INFORMATION_ACCESS = ExtensionOID.AUTHORITY_INFORMATION_ACCESS OID_AUTHORITY_KEY_IDENTIFIER = ExtensionOID.AUTHORITY_KEY_IDENTIFIER OID_BASIC_CONSTRAINTS = ExtensionOID.BASIC_CONSTRAINTS |