diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-21 09:40:27 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-21 09:40:27 -0400 |
| commit | 6a5bb366b1ab248331cd7e762557c4bbda3a04c2 (patch) | |
| tree | 9b00c743167b6c709e2cf2434b3b85a49ea3c650 | |
| parent | 26af1f094ce27792ad6982633008d12e6c482f73 (diff) | |
| parent | de0d5823e7f009e721e203064e8ad5f977e74021 (diff) | |
| download | cryptography-6a5bb366b1ab248331cd7e762557c4bbda3a04c2.tar.gz cryptography-6a5bb366b1ab248331cd7e762557c4bbda3a04c2.tar.bz2 cryptography-6a5bb366b1ab248331cd7e762557c4bbda3a04c2.zip | |
Merge pull request #2846 from reaperhulk/deprecation-dance
complete deprecation of CRLExtensionOID in favor of CRLEntryExtensionOID
| -rw-r--r-- | src/cryptography/utils.py | 1 | ||||
| -rw-r--r-- | src/cryptography/x509/__init__.py | 9 | ||||
| -rw-r--r-- | src/cryptography/x509/oid.py | 8 |
3 files changed, 0 insertions, 18 deletions
diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py index 64a1c785..4c006278 100644 --- a/src/cryptography/utils.py +++ b/src/cryptography/utils.py @@ -15,7 +15,6 @@ import warnings # the functions deprecated in 1.0 are on an arbitrarily extended deprecation # cycle and should not be removed until we agree on when that cycle ends. DeprecatedIn10 = DeprecationWarning -DeprecatedIn12 = DeprecationWarning def read_only_property(name): diff --git a/src/cryptography/x509/__init__.py b/src/cryptography/x509/__init__.py index 8d7bad27..968d29d0 100644 --- a/src/cryptography/x509/__init__.py +++ b/src/cryptography/x509/__init__.py @@ -4,7 +4,6 @@ from __future__ import absolute_import, division, print_function -from cryptography import utils from cryptography.x509.base import ( Certificate, CertificateBuilder, CertificateRevocationList, CertificateRevocationListBuilder, @@ -38,13 +37,6 @@ from cryptography.x509.oid import ( ) -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 @@ -174,7 +166,6 @@ __all__ = [ "OID_CA_ISSUERS", "OID_OCSP", "_GENERAL_NAMES", - "CRLExtensionOID", "CertificateIssuer", "CRLReason", "InvalidityDate", diff --git a/src/cryptography/x509/oid.py b/src/cryptography/x509/oid.py index ced15103..48e9d696 100644 --- a/src/cryptography/x509/oid.py +++ b/src/cryptography/x509/oid.py @@ -94,14 +94,6 @@ class CRLEntryExtensionOID(object): INVALIDITY_DATE = ObjectIdentifier("2.5.29.24") -CRLExtensionOID = utils.deprecated( - CRLEntryExtensionOID, - __name__, - "CRLExtensionOID has been renamed to CRLEntryExtensionOID", - utils.DeprecatedIn12 -) - - class NameOID(object): COMMON_NAME = ObjectIdentifier("2.5.4.3") COUNTRY_NAME = ObjectIdentifier("2.5.4.6") |