From: Elizabeth Uselton <elizabeth.uselton@rover.com>
Date: Sat, 20 Jul 2019 03:45:52 +0000 (-0700)
Subject: bpo-37555: Replacing __eq__ with == to sidestep NotImplemented
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f295eaca5bceac6636c0e2b10e6c7d9a8ee8296a;p=thirdparty%2FPython%2Fcpython.git

bpo-37555: Replacing __eq__ with == to sidestep NotImplemented

bool(NotImplemented) returns True, so it's necessary to use ==
instead of __eq__ in this comparison.
---

diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index f91836554107..aff5e70065a0 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -348,7 +348,7 @@ class _CallList(list):
         self_list = list(self)
         other_list = list(other)
         # checking equality both directions is necessary for ANY to work
-        return self_list.__eq__(other_list) or other_list.__eq__(self_list)
+        return self_list == other_list or other_list == self_list
 
 
 def _check_and_set_parent(parent, value, name, new_name):
@@ -2411,8 +2411,8 @@ class _Call(tuple):
         self_params = self_args, self_kwargs
         other_params = other_args, other_kwargs
         return (
-            self_params.__eq__(other_params)
-            or other_params.__eq__(self_params)
+            self_params == other_params
+            or other_params == self_params
         )