Commit c7f490c8 authored by Serhiy Storchaka's avatar Serhiy Storchaka

Issue #28376: Creating instances of range_iterator by calling range_iterator

type now is deprecated.  Patch by Oren Milman.
parent 639098c5
...@@ -499,29 +499,32 @@ class RangeTest(unittest.TestCase): ...@@ -499,29 +499,32 @@ class RangeTest(unittest.TestCase):
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) with test.support.check_warnings(('', DeprecationWarning)):
# rangeiter_new doesn't take keyword arguments
# rangeiter_new takes exactly 3 arguments with self.assertRaises(TypeError):
self.assertRaises(TypeError, rangeiter_type) rangeiter_type(a=1)
self.assertRaises(TypeError, rangeiter_type, 1)
self.assertRaises(TypeError, rangeiter_type, 1, 1) # rangeiter_new takes exactly 3 arguments
self.assertRaises(TypeError, rangeiter_type, 1, 1, 1, 1) self.assertRaises(TypeError, rangeiter_type)
self.assertRaises(TypeError, rangeiter_type, 1)
# start, stop and stop must fit in C long self.assertRaises(TypeError, rangeiter_type, 1, 1)
for good_val in [_testcapi.LONG_MAX, _testcapi.LONG_MIN]: self.assertRaises(TypeError, rangeiter_type, 1, 1, 1, 1)
rangeiter_type(good_val, good_val, good_val)
for bad_val in [_testcapi.LONG_MAX + 1, _testcapi.LONG_MIN - 1]: # start, stop and stop must fit in C long
self.assertRaises(OverflowError, for good_val in [_testcapi.LONG_MAX, _testcapi.LONG_MIN]:
rangeiter_type, bad_val, 1, 1) rangeiter_type(good_val, good_val, good_val)
self.assertRaises(OverflowError, for bad_val in [_testcapi.LONG_MAX + 1, _testcapi.LONG_MIN - 1]:
rangeiter_type, 1, bad_val, 1) self.assertRaises(OverflowError,
self.assertRaises(OverflowError, rangeiter_type, bad_val, 1, 1)
rangeiter_type, 1, 1, bad_val) self.assertRaises(OverflowError,
rangeiter_type, 1, bad_val, 1)
# step mustn't be zero self.assertRaises(OverflowError,
self.assertRaises(ValueError, rangeiter_type, 1, 1, 0) 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 ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment