Simplify comparisons and do not allow to compare with strings

Do not allow to compare with things that are convertible to ints, such
as a "404" string.

Author: nicoddemus

pytest_flask/plugin.py

@@ -30,35 +30,23 @@ def json(self):
         return json.loads(self.data)
 
     def __eq__(self, other):
-        try:
-            status_code = int(other)
-            return self.status_code == status_code
-        except:
-            super_class = super(JSONResponse, self)
-            try:
-                super_eq = getattr(super_class, '__eq__')
-            except AttributeError:
-                return self is other
-            else:
-                return super_eq(other)
+        if isinstance(other, int):
+            return self.status_code == other
+        return super(JSONResponse, self).__eq__(other)
 
     def __ne__(self, other):
-        return not self.__eq__(other)
+        return not self == other
 
 
 def pytest_assertrepr_compare(op, left, right):
-    if isinstance(left, JSONResponse) and op == '==':
-        try:
-            right = int(right)
-            return [
-                'Mismatch in status code for response: {} != {}'.format(
-                    left.status_code,
-                    right,
-                ),
-                'Response status: {}'.format(left.status),
-            ]
-        except:
-            pass
+    if isinstance(left, JSONResponse) and op == '==' and isinstance(right, int):
+        return [
+            'Mismatch in status code for response: {} != {}'.format(
+                left.status_code,
+                right,
+            ),
+            'Response status: {}'.format(left.status),
+        ]
     return None
 
 

tests/test_fixtures.py

@@ -36,12 +36,15 @@ def test_json_response(self, client, accept_json):
     def test_json_response_compare_to_status_code(self, client, accept_json):
         assert client.get(url_for('ping'), headers=accept_json) == 200
         assert client.get('fake-route', headers=accept_json) == 404
+        assert client.get('fake-route', headers=accept_json) != '404'
         res = client.get(url_for('ping'), headers=accept_json)
         assert res == res
 
     def test_mismatching_eq_comparison(self, client, accept_json):
         with pytest.raises(AssertionError, match=r'Mismatch in status code'):
             assert client.get('fake-route', headers=accept_json) == 200
+        with pytest.raises(AssertionError, match=r'404 NOT FOUND'):
+            assert client.get('fake-route', headers=accept_json) == '200'
 
     def test_dont_rewrite_existing_implementation(self, app, accept_json):
         class MyResponse(app.response_class):