Merge branch 'master' into minor-fixes

python · matrixise · Sep 13, 2019 · Sep 11, 2019 · Sep 11, 2019 · Sep 13, 2019
commit 8c2ab3b9c1d80d5e318d7752f71aa21fef8aaaa8
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
@@ -1013,8 +1013,27 @@ def _calls_repr(self, prefix="Calls"):
             return ""
         return f"\n{prefix}: {safe_repr(self.mock_calls)}."
 
+
 _MOCK_SIG = inspect.signature(NonCallableMock.__init__)
 
+
+class _AnyComparer(list):
+    """A list which checks if it contains a call which may have an
+    argument of ANY, flipping the components of item and self from
+    their traditional locations so that ANY is guaranteed to be on
+    the left."""
+    def __contains__(self, item):
+        for _call in self:
+            if len(item) != len(_call):
+                continue
+            if all([
+                expected == actual
+                for expected, actual in zip(item, _call)
+            ]):
+                return True
+        return False
+
+
 def _try_iter(obj):
     if obj is None:
         return obj