change it to not_valid_* why not

4 files changed, 24 insertions, 20 deletions

diff --git a/docs/hazmat/primitives/interfaces.rst b/docs/hazmat/primitives/interfaces.rst
index fee504676..8e86546d2 100644
--- a/docs/hazmat/primitives/interfaces.rst
+++ b/docs/hazmat/primitives/interfaces.rst
@@ -733,14 +733,14 @@ X509
 
         The public key associated with the certificate.
 
-    .. attribute:: not_before
+    .. attribute:: not_valid_before
 
         :type: :class:`datetime.datetime`
 
     A naïve datetime representing the beginning of the validity period for the
     certificate in UTC. This value is inclusive.
 
-    .. attribute:: not_after
+    .. attribute:: not_valid_after
 
         :type: :class:`datetime.datetime`
 
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py
index 4126a3973..a348630f0 100644
--- a/src/cryptography/hazmat/backends/openssl/x509.py
+++ b/src/cryptography/hazmat/backends/openssl/x509.py
@@ -83,12 +83,12 @@ class _X509Certificate(object):
         return self._backend._evp_pkey_to_public_key(pkey)
 
     @property
-    def not_before(self):
+    def not_valid_before(self):
         asn1_time = self._backend._lib.X509_get_notBefore(self._x509)
         return self._parse_asn1_time(asn1_time)
 
     @property
-    def not_after(self):
+    def not_valid_after(self):
         asn1_time = self._backend._lib.X509_get_notAfter(self._x509)
         return self._parse_asn1_time(asn1_time)
 
diff --git a/src/cryptography/hazmat/primitives/interfaces.py b/src/cryptography/hazmat/primitives/interfaces.py
index 18a626017..76616e1f9 100644
--- a/src/cryptography/hazmat/primitives/interfaces.py
+++ b/src/cryptography/hazmat/primitives/interfaces.py
@@ -517,13 +517,13 @@ class X509Certificate(object):
         """
 
     @abc.abstractproperty
-    def not_before(self):
+    def not_valid_before(self):
         """
         Not before time (represented as UTC datetime)
         """
 
     @abc.abstractproperty
-    def not_after(self):
+    def not_valid_after(self):
         """
         Not after time (represented as UTC datetime)
         """
diff --git a/tests/test_x509.py b/tests/test_x509.py
index 73810f18f..4fac1e556 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -56,12 +56,12 @@ class TestRSAX509Certificate(object):
             backend
         )
 
-        assert cert.not_before == datetime.datetime(2010, 1, 1, 8, 30)
-        assert cert.not_after == datetime.datetime(2030, 12, 31, 8, 30)
+        assert cert.not_valid_before == datetime.datetime(2010, 1, 1, 8, 30)
+        assert cert.not_valid_after == datetime.datetime(2030, 12, 31, 8, 30)
         assert cert.serial == 2
         public_key = cert.public_key()
         assert isinstance(public_key, interfaces.RSAPublicKey)
-        assert cert.version == x509.X509Version.v3
+        assert cert.version is x509.X509Version.v3
         fingerprint = binascii.hexlify(cert.fingerprint(hashes.SHA1()))
         assert fingerprint == b"6f49779533d565e8b7c1062503eab41492c38e4d"
 
@@ -75,7 +75,7 @@ class TestRSAX509Certificate(object):
             backend
         )
 
-        assert cert.not_before == datetime.datetime(1950, 1, 1, 12, 1)
+        assert cert.not_valid_before == datetime.datetime(1950, 1, 1, 12, 1)
 
     def test_pre_2000_utc_not_after_cert(self, backend):
         cert = _load_cert(
@@ -87,7 +87,7 @@ class TestRSAX509Certificate(object):
             backend
         )
 
-        assert cert.not_after == datetime.datetime(1999, 1, 1, 12, 1)
+        assert cert.not_valid_after == datetime.datetime(1999, 1, 1, 12, 1)
 
     def test_post_2000_utc_cert(self, backend):
         cert = _load_cert(
@@ -95,8 +95,12 @@ class TestRSAX509Certificate(object):
             x509.load_pem_x509_certificate,
             backend
         )
-        assert cert.not_before == datetime.datetime(2014, 11, 26, 21, 41, 20)
-        assert cert.not_after == datetime.datetime(2014, 12, 26, 21, 41, 20)
+        assert cert.not_valid_before == datetime.datetime(
+            2014, 11, 26, 21, 41, 20
+        )
+        assert cert.not_valid_after == datetime.datetime(
+            2014, 12, 26, 21, 41, 20
+        )
 
     def test_generalized_time_not_before_cert(self, backend):
         cert = _load_cert(
@@ -107,9 +111,9 @@ class TestRSAX509Certificate(object):
             x509.load_der_x509_certificate,
             backend
         )
-        assert cert.not_before == datetime.datetime(2002, 1, 1, 12, 1)
-        assert cert.not_after == datetime.datetime(2030, 12, 31, 8, 30)
-        assert cert.version == x509.X509Version.v3
+        assert cert.not_valid_before == datetime.datetime(2002, 1, 1, 12, 1)
+        assert cert.not_valid_after == datetime.datetime(2030, 12, 31, 8, 30)
+        assert cert.version is x509.X509Version.v3
 
     def test_generalized_time_not_after_cert(self, backend):
         cert = _load_cert(
@@ -120,9 +124,9 @@ class TestRSAX509Certificate(object):
             x509.load_der_x509_certificate,
             backend
         )
-        assert cert.not_before == datetime.datetime(2010, 1, 1, 8, 30)
-        assert cert.not_after == datetime.datetime(2050, 1, 1, 12, 1)
-        assert cert.version == x509.X509Version.v3
+        assert cert.not_valid_before == datetime.datetime(2010, 1, 1, 8, 30)
+        assert cert.not_valid_after == datetime.datetime(2050, 1, 1, 12, 1)
+        assert cert.version is x509.X509Version.v3
 
     def test_invalid_version_cert(self, backend):
         cert = _load_cert(
@@ -139,7 +143,7 @@ class TestRSAX509Certificate(object):
             x509.load_pem_x509_certificate,
             backend
         )
-        assert cert.version == x509.X509Version.v1
+        assert cert.version is x509.X509Version.v1
 
     def test_invalid_pem(self, backend):
         with pytest.raises(ValueError):