aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Ertl <mati@fsinf.at>2019-03-25 22:25:49 +0100
committerAlex Gaynor <alex.gaynor@gmail.com>2019-03-25 14:25:49 -0700
commit91105952739442a74582d3e62b3d2111365b0dc7 (patch)
tree1d9ee247fcfe24d5ff1456cc1d377bedba2fb08b
parent5c037cc8eb800b0da4a6c475cecbdec3b182422b (diff)
downloadcryptography-91105952739442a74582d3e62b3d2111365b0dc7.tar.gz
cryptography-91105952739442a74582d3e62b3d2111365b0dc7.tar.bz2
cryptography-91105952739442a74582d3e62b3d2111365b0dc7.zip
fix != comparison in py2 (fixes #4821) (#4822)
* fix != comparison in py2 (fixes #4821) * remove blank line b/c pep8 * move __ne__ next to __eq__ as per review request
-rw-r--r--src/cryptography/x509/extensions.py6
-rw-r--r--tests/x509/test_x509_ext.py14
2 files changed, 16 insertions, 4 deletions
diff --git a/src/cryptography/x509/extensions.py b/src/cryptography/x509/extensions.py
index 7884afbd..e64e09c5 100644
--- a/src/cryptography/x509/extensions.py
+++ b/src/cryptography/x509/extensions.py
@@ -862,6 +862,9 @@ class OCSPNoCheck(object):
return True
+ def __ne__(self, other):
+ return not self == other
+
def __hash__(self):
return hash(OCSPNoCheck)
@@ -879,6 +882,9 @@ class PrecertPoison(object):
return True
+ def __ne__(self, other):
+ return not self == other
+
def __hash__(self):
return hash(PrecertPoison)
diff --git a/tests/x509/test_x509_ext.py b/tests/x509/test_x509_ext.py
index fabf4106..ec618d9a 100644
--- a/tests/x509/test_x509_ext.py
+++ b/tests/x509/test_x509_ext.py
@@ -4404,9 +4404,12 @@ class TestOCSPNoCheckExtension(object):
assert hash(onc1) == hash(onc2)
def test_ne(self):
- onc = x509.OCSPNoCheck()
+ onc1 = x509.OCSPNoCheck()
+ onc2 = x509.OCSPNoCheck()
- assert onc != object()
+ assert onc1 == onc2
+ assert (onc1 != onc2) is False
+ assert onc1 != object()
def test_repr(self):
onc = x509.OCSPNoCheck()
@@ -4929,9 +4932,12 @@ class TestPrecertPoisonExtension(object):
assert hash(pcp1) == hash(pcp2)
def test_ne(self):
- pcp = x509.PrecertPoison()
+ pcp1 = x509.PrecertPoison()
+ pcp2 = x509.PrecertPoison()
- assert pcp != object()
+ assert pcp1 == pcp2
+ assert (pcp1 != pcp2) is False
+ assert pcp1 != object()
def test_repr(self):
pcp = x509.PrecertPoison()