changeset:   104380:06f065a59751
branch:      3.6
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sat Oct 08 21:50:45 2016 +0300
files:       Lib/test/test_range.py Misc/NEWS Objects/rangeobject.c
description:
Issue #28376: Creating instances of range_iterator by calling range_iterator
type now is deprecated.  Patch by Oren Milman.


diff -r e02d9ae3fde7 -r 06f065a59751 Lib/test/test_range.py
--- a/Lib/test/test_range.py	Sat Oct 08 21:45:07 2016 +0300
+++ b/Lib/test/test_range.py	Sat Oct 08 21:50:45 2016 +0300
@@ -499,29 +499,32 @@
         import _testcapi
         rangeiter_type = type(iter(range(0)))
 
-        # rangeiter_new doesn't take keyword arguments
-        with self.assertRaises(TypeError):
-            rangeiter_type(a=1)
+        self.assertWarns(DeprecationWarning, rangeiter_type, 1, 3, 1)
 
-        # rangeiter_new takes exactly 3 arguments
-        self.assertRaises(TypeError, rangeiter_type)
-        self.assertRaises(TypeError, rangeiter_type, 1)
-        self.assertRaises(TypeError, rangeiter_type, 1, 1)
-        self.assertRaises(TypeError, rangeiter_type, 1, 1, 1, 1)
+        with test.support.check_warnings(('', DeprecationWarning)):
+            # rangeiter_new doesn't take keyword arguments
+            with self.assertRaises(TypeError):
+                rangeiter_type(a=1)
+
+            # rangeiter_new takes exactly 3 arguments
+            self.assertRaises(TypeError, rangeiter_type)
+            self.assertRaises(TypeError, rangeiter_type, 1)
+            self.assertRaises(TypeError, rangeiter_type, 1, 1)
+            self.assertRaises(TypeError, rangeiter_type, 1, 1, 1, 1)
 
-        # start, stop and stop must fit in C long
-        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)
+            # start, stop and stop must fit in C long
+            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)
+            # step mustn't be zero
+            self.assertRaises(ValueError, rangeiter_type, 1, 1, 0)
 
     def test_slice(self):
         def check(start, stop, step=None):
diff -r e02d9ae3fde7 -r 06f065a59751 Misc/NEWS
--- a/Misc/NEWS	Sat Oct 08 21:45:07 2016 +0300
+++ b/Misc/NEWS	Sat Oct 08 21:50:45 2016 +0300
@@ -10,6 +10,9 @@
 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.
   Patch by Oren Milman.
 
diff -r e02d9ae3fde7 -r 06f065a59751 Objects/rangeobject.c
--- a/Objects/rangeobject.c	Sat Oct 08 21:45:07 2016 +0300
+++ b/Objects/rangeobject.c	Sat Oct 08 21:50:45 2016 +0300
@@ -930,6 +930,13 @@
 {
     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)) {
         return NULL;
     }