mirror of https://github.com/python/cpython.git
Issue #28376: Creating instances of range_iterator by calling range_iterator
type now is deprecated. Patch by Oren Milman.
This commit is contained in:
parent
639098c591
commit
c7f490c8b1
|
@ -499,29 +499,32 @@ def test_range_iterator_invocation(self):
|
||||||
import _testcapi
|
import _testcapi
|
||||||
rangeiter_type = type(iter(range(0)))
|
rangeiter_type = type(iter(range(0)))
|
||||||
|
|
||||||
# rangeiter_new doesn't take keyword arguments
|
self.assertWarns(DeprecationWarning, rangeiter_type, 1, 3, 1)
|
||||||
with self.assertRaises(TypeError):
|
|
||||||
rangeiter_type(a=1)
|
|
||||||
|
|
||||||
# rangeiter_new takes exactly 3 arguments
|
with test.support.check_warnings(('', DeprecationWarning)):
|
||||||
self.assertRaises(TypeError, rangeiter_type)
|
# rangeiter_new doesn't take keyword arguments
|
||||||
self.assertRaises(TypeError, rangeiter_type, 1)
|
with self.assertRaises(TypeError):
|
||||||
self.assertRaises(TypeError, rangeiter_type, 1, 1)
|
rangeiter_type(a=1)
|
||||||
self.assertRaises(TypeError, rangeiter_type, 1, 1, 1, 1)
|
|
||||||
|
|
||||||
# start, stop and stop must fit in C long
|
# rangeiter_new takes exactly 3 arguments
|
||||||
for good_val in [_testcapi.LONG_MAX, _testcapi.LONG_MIN]:
|
self.assertRaises(TypeError, rangeiter_type)
|
||||||
rangeiter_type(good_val, good_val, good_val)
|
self.assertRaises(TypeError, rangeiter_type, 1)
|
||||||
for bad_val in [_testcapi.LONG_MAX + 1, _testcapi.LONG_MIN - 1]:
|
self.assertRaises(TypeError, rangeiter_type, 1, 1)
|
||||||
self.assertRaises(OverflowError,
|
self.assertRaises(TypeError, rangeiter_type, 1, 1, 1, 1)
|
||||||
rangeiter_type, bad_val, 1, 1)
|
|
||||||
self.assertRaises(OverflowError,
|
|
||||||
rangeiter_type, 1, bad_val, 1)
|
|
||||||
self.assertRaises(OverflowError,
|
|
||||||
rangeiter_type, 1, 1, bad_val)
|
|
||||||
|
|
||||||
# step mustn't be zero
|
# start, stop and stop must fit in C long
|
||||||
self.assertRaises(ValueError, rangeiter_type, 1, 1, 0)
|
for good_val in [_testcapi.LONG_MAX, _testcapi.LONG_MIN]:
|
||||||
|
rangeiter_type(good_val, good_val, good_val)
|
||||||
|
for bad_val in [_testcapi.LONG_MAX + 1, _testcapi.LONG_MIN - 1]:
|
||||||
|
self.assertRaises(OverflowError,
|
||||||
|
rangeiter_type, bad_val, 1, 1)
|
||||||
|
self.assertRaises(OverflowError,
|
||||||
|
rangeiter_type, 1, bad_val, 1)
|
||||||
|
self.assertRaises(OverflowError,
|
||||||
|
rangeiter_type, 1, 1, bad_val)
|
||||||
|
|
||||||
|
# step mustn't be zero
|
||||||
|
self.assertRaises(ValueError, rangeiter_type, 1, 1, 0)
|
||||||
|
|
||||||
def test_slice(self):
|
def test_slice(self):
|
||||||
def check(start, stop, step=None):
|
def check(start, stop, step=None):
|
||||||
|
|
|
@ -10,6 +10,9 @@ What's New in Python 3.6.0 beta 2
|
||||||
Core and Builtins
|
Core and Builtins
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
- Issue #28376: Creating instances of range_iterator by calling range_iterator
|
||||||
|
type now is deprecated. Patch by Oren Milman.
|
||||||
|
|
||||||
- Issue #28376: The constructor of range_iterator now checks that step is not 0.
|
- Issue #28376: The constructor of range_iterator now checks that step is not 0.
|
||||||
Patch by Oren Milman.
|
Patch by Oren Milman.
|
||||||
|
|
||||||
|
|
|
@ -930,6 +930,13 @@ rangeiter_new(PyTypeObject *type, PyObject *args, PyObject *kw)
|
||||||
{
|
{
|
||||||
long start, stop, step;
|
long start, stop, step;
|
||||||
|
|
||||||
|
if (PyErr_WarnEx(PyExc_DeprecationWarning,
|
||||||
|
"range_iterator(): creating instances of range_iterator "
|
||||||
|
"by calling range_iterator type is deprecated",
|
||||||
|
1)) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
if (!_PyArg_NoKeywords("range_iterator()", kw)) {
|
if (!_PyArg_NoKeywords("range_iterator()", kw)) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue