Merge issue #26355 fix from Python 3.5

1 files changed, 28 insertions, 24 deletions

diff --git a/Lib/test/test_range.py b/Lib/test/test_range.py
index c022f070bf..9e11e518f6 100644
--- a/Lib/test/test_range.py
+++ b/Lib/test/test_range.py
@@ -1,9 +1,10 @@
 # Python test set -- built-in functions
 
-import test.support, unittest
+import unittest
 import sys
 import pickle
 import itertools
+import test.support
 
 # pure Python implementations (3 args only), for comparison
 def pyrange(start, stop, step):
@@ -498,29 +499,32 @@ class RangeTest(unittest.TestCase):
         import _testcapi
         rangeiter_type = type(iter(range(0)))
 
-        # 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)
-
-        # step mustn't be zero
-        self.assertRaises(ValueError, rangeiter_type, 1, 1, 0)
+        self.assertWarns(DeprecationWarning, rangeiter_type, 1, 3, 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)
+
+            # step mustn't be zero
+            self.assertRaises(ValueError, rangeiter_type, 1, 1, 0)
 
     def test_slice(self):
         def check(start, stop, step=None):