diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-11-20 22:35:41 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-11-20 22:35:41 (GMT) |
| commit | 0b458d52f9c58f0a47ea448e2349704fd33a7fe3 (patch) | |
| tree | f39a5ecfd620ce0df8b8854e91e3dcb6d03c75d6 | |
| parent | 2e579f0a87cdc196eb3df2ccdf8d85b628793637 (diff) | |
| download | cpython-0b458d52f9c58f0a47ea448e2349704fd33a7fe3.zip cpython-0b458d52f9c58f0a47ea448e2349704fd33a7fe3.tar.gz cpython-0b458d52f9c58f0a47ea448e2349704fd33a7fe3.tar.bz2 | |
count() should return integers #10474
| -rw-r--r-- | Lib/test/test_builtin.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Objects/rangeobject.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index d2d4fa9..4d9b5c3 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -1033,6 +1033,8 @@ class BuiltinTest(unittest.TestCase): self.assertEqual(range(3).count(1), 1) self.assertEqual(range(3).count(2), 1) self.assertEqual(range(3).count(3), 0) + self.assertIs(type(range(3).count(-1)), int) + self.assertIs(type(range(3).count(1)), int) self.assertEqual(range(10**20).count(1), 1) self.assertEqual(range(10**20).count(10**20), 0) @@ -10,6 +10,8 @@ What's New in Python 3.2 Beta 1? Core and Builtins ----------------- +- Issue #10474: range().count() should return integers. + - Issue #10255: Fix reference leak in Py_InitializeEx(). Patch by Neil Schemenauer. diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index 9650386..2188dfb 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -338,9 +338,9 @@ range_count(rangeobject *r, PyObject *ob) { if (PyLong_CheckExact(ob) || PyBool_Check(ob)) { if (range_contains_long(r, ob)) - Py_RETURN_TRUE; + return PyLong_FromLong(1); else - Py_RETURN_FALSE; + return PyLong_FromLong(0); } else { Py_ssize_t count; count = _PySequence_IterSearch((PyObject*)r, ob, PY_ITERSEARCH_COUNT); |