bpo-44558: Match countOf `is`/`==` treatment to c (GH-27007)

This commit is contained in:
Rupert Tombs 2021-07-07 14:28:09 +01:00 committed by GitHub
parent 8363c53369
commit 6bd3ecfc27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 6 deletions

View File

@ -155,10 +155,10 @@ def contains(a, b):
return b in a
def countOf(a, b):
"Return the number of times b occurs in a."
"Return the number of items in a which are, or which equal, b."
count = 0
for i in a:
if i == b:
if i is b or i == b:
count += 1
return count

View File

@ -153,6 +153,11 @@ class OperatorTestCase:
self.assertRaises(ZeroDivisionError, operator.countOf, BadIterable(), 1)
self.assertEqual(operator.countOf([1, 2, 1, 3, 1, 4], 3), 1)
self.assertEqual(operator.countOf([1, 2, 1, 3, 1, 4], 5), 0)
# is but not ==
nan = float("nan")
self.assertEqual(operator.countOf([nan, nan, 21], nan), 2)
# == but not is
self.assertEqual(operator.countOf([{}, 1, {}, 2], {}), 2)
def test_delitem(self):
operator = self.module

View File

@ -0,0 +1,2 @@
Match the docstring and python implementation of :func:`~operator.countOf` to the behavior
of its c implementation.

View File

@ -507,12 +507,12 @@ _operator_indexOf_impl(PyObject *module, PyObject *a, PyObject *b)
/*[clinic input]
_operator.countOf = _operator.indexOf
Return the number of times b occurs in a.
Return the number of items in a which are, or which equal, b.
[clinic start generated code]*/
static Py_ssize_t
_operator_countOf_impl(PyObject *module, PyObject *a, PyObject *b)
/*[clinic end generated code: output=9e1623197daf3382 input=0c3a2656add252db]*/
/*[clinic end generated code: output=9e1623197daf3382 input=93ea57f170f3f0bb]*/
{
return PySequence_Count(a, b);
}

View File

@ -957,7 +957,7 @@ PyDoc_STRVAR(_operator_countOf__doc__,
"countOf($module, a, b, /)\n"
"--\n"
"\n"
"Return the number of times b occurs in a.");
"Return the number of items in a which are, or which equal, b.");
#define _OPERATOR_COUNTOF_METHODDEF \
{"countOf", (PyCFunction)(void(*)(void))_operator_countOf, METH_FASTCALL, _operator_countOf__doc__},
@ -1486,4 +1486,4 @@ _operator__compare_digest(PyObject *module, PyObject *const *args, Py_ssize_t na
exit:
return return_value;
}
/*[clinic end generated code: output=eae5d08f971a65fd input=a9049054013a1b77]*/
/*[clinic end generated code: output=16749e11fda51785 input=a9049054013a1b77]*/