diff options
| -rw-r--r-- | Lib/test/test_xrange.py | 7 | ||||
| -rw-r--r-- | Objects/rangeobject.c | 7 |
2 files changed, 1 insertions, 13 deletions
diff --git a/Lib/test/test_xrange.py b/Lib/test/test_xrange.py index 9f9daa7..eafb7fa 100644 --- a/Lib/test/test_xrange.py +++ b/Lib/test/test_xrange.py @@ -54,12 +54,7 @@ class XrangeTest(unittest.TestCase): self.assertRaises(OverflowError, xrange, 0, 2*sys.maxint) r = xrange(-sys.maxint, sys.maxint, 2) - if sys.maxint > 0x7fffffff: - # XXX raising ValueError is less than ideal, but this can't - # be fixed until range_length() returns a long in rangeobject.c - self.assertRaises(ValueError, len, r) - else: - self.assertEqual(len(r), sys.maxint) + self.assertEqual(len(r), sys.maxint) self.assertRaises(OverflowError, xrange, -sys.maxint-1, sys.maxint, 2) def test_main(): diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index 707ad46..e8374c1 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -104,13 +104,6 @@ range_item(rangeobject *r, Py_ssize_t i) static Py_ssize_t range_length(rangeobject *r) { -#if LONG_MAX != INT_MAX /* XXX ssize_t_max */ - if (r->len > INT_MAX) { - PyErr_SetString(PyExc_ValueError, - "xrange object size cannot be reported"); - return -1; - } -#endif return (Py_ssize_t)(r->len); } |