commit 6eeaf0bd76f5d40e9fbd9bc17b1b2fd08df186c4
author Alex Gaynor <alex.gaynor@gmail.com> Fri Jun 03 12:40:22 2016 -0700
committer Paul Kehrer <paul.l.kehrer@gmail.com> Fri Jun 03 12:40:22 2016 -0700
tree a0d1019da337fcf862cd3fff394e33ca2c5dd8af
parent 0c11d0427e12557fa41cdfbc00f6a83a36c58af7

small cleanups to the cert.serial warning (#2958)

src/cryptography/hazmat/backends/openssl/x509.py

diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py
index 94a81ce..4851dfc 100644
--- a/src/cryptography/hazmat/backends/openssl/x509.py
+++ b/src/cryptography/hazmat/backends/openssl/x509.py
@@ -61,7 +61,8 @@
     def serial(self):
         warnings.warn(
             "Certificate serial is deprecated, use serial_number instead.",
-            utils.DeprecatedIn10
+            utils.DeprecatedIn14,
+            stacklevel=2
         )
         return self.serial_number
 

src/cryptography/x509/base.py

diff --git a/src/cryptography/x509/base.py b/src/cryptography/x509/base.py
index 8e3f966..ab70fe7 100644
--- a/src/cryptography/x509/base.py
+++ b/src/cryptography/x509/base.py
@@ -63,12 +63,6 @@
         """
 
     @abc.abstractproperty
-    def serial(self):
-        """
-        Returns certificate serial number
-        """
-
-    @abc.abstractproperty
     def serial_number(self):
         """
         Returns certificate serial number