Make exceptions hashable (but not comparable)

Fixes python-jsonschema#477
stuarteberg · Dec 6, 2018 · 2c83d78 · 2c83d78
1 parent 1a8ea88
commit 2c83d78
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 14 deletions.
diff --git a/jsonschema/__pycache__/__init__.cpython-36.pyc b/jsonschema/__pycache__/__init__.cpython-36.pyc
diff --git a/jsonschema/__pycache__/_format.cpython-36.pyc b/jsonschema/__pycache__/_format.cpython-36.pyc
diff --git a/jsonschema/__pycache__/_types.cpython-36.pyc b/jsonschema/__pycache__/_types.cpython-36.pyc
diff --git a/jsonschema/__pycache__/_utils.cpython-36.pyc b/jsonschema/__pycache__/_utils.cpython-36.pyc
diff --git a/jsonschema/__pycache__/_validators.cpython-36.pyc b/jsonschema/__pycache__/_validators.cpython-36.pyc
diff --git a/jsonschema/__pycache__/_version.cpython-36.pyc b/jsonschema/__pycache__/_version.cpython-36.pyc
diff --git a/jsonschema/__pycache__/compat.cpython-36.pyc b/jsonschema/__pycache__/compat.cpython-36.pyc
diff --git a/jsonschema/__pycache__/exceptions.cpython-36.pyc b/jsonschema/__pycache__/exceptions.cpython-36.pyc
diff --git a/jsonschema/__pycache__/validators.cpython-36.pyc b/jsonschema/__pycache__/validators.cpython-36.pyc
diff --git a/jsonschema/_version.py b/jsonschema/_version.py
@@ -0,0 +1,5 @@
+
+# This file is automatically generated by setup.py.
+__version__ = '2.5.1.post64'
+__sha__ = 'gcb20c89'
+__revision__ = 'gcb20c89'
diff --git a/jsonschema/exceptions.py b/jsonschema/exceptions.py
@@ -55,16 +55,6 @@ def __init__(
         for error in context:
             error.parent = self
 
-    def __eq__(self, other):
-        if not isinstance(other, self.__class__):
-            return NotImplemented
-        return self._contents() == other._contents()
-
-    def __ne__(self, other):
-        if not isinstance(other, self.__class__):
-            return NotImplemented
-        return not self == other
-
     def __repr__(self):
         return "<%s: %r>" % (self.__class__.__name__, self.message)
 

diff --git a/jsonschema/tests/__pycache__/__init__.cpython-36.pyc b/jsonschema/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/jsonschema/tests/__pycache__/test_exceptions.cpython-36.pyc b/jsonschema/tests/__pycache__/test_exceptions.cpython-36.pyc
diff --git a/jsonschema/tests/test_exceptions.py b/jsonschema/tests/test_exceptions.py
@@ -12,7 +12,7 @@ def best_match(self, errors):
         reversed_best = exceptions.best_match(reversed(errors))
         msg = "Didn't return a consistent best match!\nGot: {0}\n\nThen: {1}"
         self.assertEqual(
-            best, reversed_best, msg=msg.format(best, reversed_best),
+            best._contents(), reversed_best._contents(), msg=msg.format(best, reversed_best),
         )
         return best
 
@@ -460,3 +460,9 @@ def __ne__(this, other):  # pragma: no cover
             schema="schema",
         )
         self.assertIn(repr(instance), str(error))
+
+
+class TestHashable(TestCase):
+    def test_hashable(self):
+        set([exceptions.ValidationError("")])
+        set([exceptions.SchemaError("")])
diff --git a/jsonschema/tests/test_validators.py b/jsonschema/tests/test_validators.py
@@ -73,17 +73,21 @@ def test_iter_errors(self):
         schema = {u"startswith": u"hel"}
         iter_errors = self.Validator(schema).iter_errors
 
-        self.assertEqual(list(iter_errors(u"hello")), [])
+        errors = list(iter_errors(u"hello"))
+        self.assertEqual(errors, [])
 
-        error = ValidationError(
+        expected_error = ValidationError(
             u"Whoops!",
             instance=u"goodbye",
             schema=schema,
             validator=u"startswith",
             validator_value=u"hel",
             schema_path=deque([u"startswith"]),
         )
-        self.assertEqual(list(iter_errors(u"goodbye")), [error])
+
+        errors = list(iter_errors(u"goodbye"))
+        self.assertEqual(len(errors), 1)
+        self.assertEqual(errors[0]._contents(), expected_error._contents())
 
     def test_if_a_version_is_provided_it_is_registered(self):
         Validator = validators.create(