mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

repr(range(10)) now returns 'range(0, 10)' for clarity.

Browse source
This commit is contained in:
Walter Dörwald 2007-05-21 10:43:34 +00:00
parent c2f6a58ffd
commit 03b43d8a77
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_xrange.py
View file

@ -57,7 +57,7 @@ class XrangeTest(unittest.TestCase):
self.assertEqual(len(r), sys.maxint) self.assertEqual(len(r), sys.maxint)
def test_repr(self): def test_repr(self):
self.assertEqual(repr(range(1)), 'range(1)') self.assertEqual(repr(range(1)), 'range(0, 1)')
self.assertEqual(repr(range(1, 2)), 'range(1, 2)') self.assertEqual(repr(range(1, 2)), 'range(1, 2)')
self.assertEqual(repr(range(1, 2, 3)), 'range(1, 2, 3)') self.assertEqual(repr(range(1, 2, 3)), 'range(1, 2, 3)')

13
Objects/rangeobject.c
View file

@ -234,24 +234,17 @@ range_item(rangeobject *r, Py_ssize_t i)
static PyObject * static PyObject *
range_repr(rangeobject *r) range_repr(rangeobject *r)
{ {
Py_ssize_t istart, istep; Py_ssize_t istep;
/* Check for special case values for printing. We don't always /* Check for special case values for printing. We don't always
need the start or step values. We don't care about errors need the step value. We don't care about errors
(it means overflow), so clear the errors. */ (it means overflow), so clear the errors. */
istart = PyNumber_AsSsize_t(r->start, NULL);
if (istart != 0 || (istart == -1 && PyErr_Occurred())) {
PyErr_Clear();
}
istep = PyNumber_AsSsize_t(r->step, NULL); istep = PyNumber_AsSsize_t(r->step, NULL);
if (istep != 1 || (istep == -1 && PyErr_Occurred())) { if (istep != 1 || (istep == -1 && PyErr_Occurred())) {
PyErr_Clear(); PyErr_Clear();
} }
if (istart == 0 && istep == 1) if (istep == 1)
return PyUnicode_FromFormat("range(%R)", r->stop);
else if (istep == 1)
return PyUnicode_FromFormat("range(%R, %R)", r->start, r->stop); return PyUnicode_FromFormat("range(%R, %R)", r->start, r->stop);
else else
return PyUnicode_FromFormat("range(%R, %R, %R)", return PyUnicode_FromFormat("range(%R, %R, %R)",