diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-03-21 09:24:12 -0400 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-03-21 09:24:12 -0400 |
commit | a783c57b7fa71a7cc6e354f37f79cc7239fb8bd7 (patch) | |
tree | c78c71feac23089219cd554791857e45a875edc9 /src/cryptography/x509/extensions.py | |
parent | fd2b27aa063c31258482c9b432c80c98b5a93f07 (diff) | |
download | cryptography-a783c57b7fa71a7cc6e354f37f79cc7239fb8bd7.tar.gz cryptography-a783c57b7fa71a7cc6e354f37f79cc7239fb8bd7.tar.bz2 cryptography-a783c57b7fa71a7cc6e354f37f79cc7239fb8bd7.zip |
Remove API deprecated in 1.6, clean up the legacy deprecations (#3468)
* Remove API deprecated in 1.6, clean up the legacy deprecations
* flake8, unused import
Diffstat (limited to 'src/cryptography/x509/extensions.py')
-rw-r--r-- | src/cryptography/x509/extensions.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/cryptography/x509/extensions.py b/src/cryptography/x509/extensions.py index 1a3ced7d..ba19b3a3 100644 --- a/src/cryptography/x509/extensions.py +++ b/src/cryptography/x509/extensions.py @@ -8,7 +8,6 @@ import abc import datetime import hashlib import ipaddress -import warnings from enum import Enum from asn1crypto.keys import PublicKeyInfo @@ -20,7 +19,7 @@ from cryptography.hazmat.primitives import constant_time, serialization from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePublicKey from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey from cryptography.x509.general_name import GeneralName, IPAddress, OtherName -from cryptography.x509.name import Name, RelativeDistinguishedName +from cryptography.x509.name import RelativeDistinguishedName from cryptography.x509.oid import ( CRLEntryExtensionOID, ExtensionOID, ObjectIdentifier ) @@ -421,16 +420,7 @@ class DistributionPoint(object): ) if relative_name: - if isinstance(relative_name, Name): - warnings.warn( - "relative_name=<Name> is deprecated and will " - "be removed in a future version; use " - "<RelativeDistinguishedName> instead.", - utils.DeprecatedIn16, - stacklevel=2 - ) - relative_name = RelativeDistinguishedName(relative_name) - elif not isinstance(relative_name, RelativeDistinguishedName): + if not isinstance(relative_name, RelativeDistinguishedName): raise TypeError( "relative_name must be a RelativeDistinguishedName" ) |