From 6eeaf0bd76f5d40e9fbd9bc17b1b2fd08df186c4 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 3 Jun 2016 12:40:22 -0700 Subject: small cleanups to the cert.serial warning (#2958) --- src/cryptography/hazmat/backends/openssl/x509.py | 3 ++- src/cryptography/x509/base.py | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index 94a81ce6..4851dfcf 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -61,7 +61,8 @@ class _Certificate(object): def serial(self): warnings.warn( "Certificate serial is deprecated, use serial_number instead.", - utils.DeprecatedIn10 + utils.DeprecatedIn14, + stacklevel=2 ) return self.serial_number diff --git a/src/cryptography/x509/base.py b/src/cryptography/x509/base.py index 8e3f9668..ab70fe75 100644 --- a/src/cryptography/x509/base.py +++ b/src/cryptography/x509/base.py @@ -62,12 +62,6 @@ class Certificate(object): Returns bytes using digest passed. """ - @abc.abstractproperty - def serial(self): - """ - Returns certificate serial number - """ - @abc.abstractproperty def serial_number(self): """ -- cgit v1.2.3