diff options
| author | Walter Dörwald <walter@livinglogic.de> | 2007-05-21 18:01:17 (GMT) |
|---|---|---|
| committer | Walter Dörwald <walter@livinglogic.de> | 2007-05-21 18:01:17 (GMT) |
| commit | 4ad94210d1b8477b0cb7a4bca2f39dc385ab21a2 (patch) | |
| tree | 6b7e2ff6bde963728e900c62a411c7a06a7e3a01 | |
| parent | 03b43d8a77f188f836262c201160a7ba9f2174bc (diff) | |
| download | cpython-4ad94210d1b8477b0cb7a4bca2f39dc385ab21a2.zip cpython-4ad94210d1b8477b0cb7a4bca2f39dc385ab21a2.tar.gz cpython-4ad94210d1b8477b0cb7a4bca2f39dc385ab21a2.tar.bz2 | |
Rename test_xrange.py to test_range.py and fix the
type name in various spots.
| -rw-r--r-- | Include/rangeobject.h | 3 | ||||
| -rw-r--r-- | Lib/test/test_range.py (renamed from Lib/test/test_xrange.py) | 4 | ||||
| -rw-r--r-- | Objects/rangeobject.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/Include/rangeobject.h b/Include/rangeobject.h index 359bcb6..847da80 100644 --- a/Include/rangeobject.h +++ b/Include/rangeobject.h @@ -7,9 +7,6 @@ extern "C" { #endif -/* This is about the type 'xrange', not the built-in function range(), which - returns regular lists. */ - /* A range object represents an integer range. This is an immutable object; a range cannot change its value after creation. diff --git a/Lib/test/test_xrange.py b/Lib/test/test_range.py index 3a5adf2..65433d4 100644 --- a/Lib/test/test_xrange.py +++ b/Lib/test/test_range.py @@ -7,8 +7,8 @@ import warnings warnings.filterwarnings("ignore", "integer argument expected", DeprecationWarning, "unittest") -class XrangeTest(unittest.TestCase): - def test_xrange(self): +class RangeTest(unittest.TestCase): + def test_range(self): self.assertEqual(list(range(3)), [0, 1, 2]) self.assertEqual(list(range(1, 5)), [1, 2, 3, 4]) self.assertEqual(list(range(0)), []) diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index 4a45212..8cefe67 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -214,7 +214,7 @@ range_item(rangeobject *r, Py_ssize_t i) if (i < 0 || i >= len) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_IndexError, - "xrange object index out of range"); + "range object index out of range"); return NULL; } @@ -313,7 +313,7 @@ PyTypeObject PyRange_Type = { range_new, /* tp_new */ }; -/*********************** Xrange Iterator **************************/ +/*********************** range Iterator **************************/ /* There are 2 types of iterators, one for C longs, the other for Python longs (ie, PyObjects). This should make iteration fast |