Merge branch 'master' into randrange-index

python · serhiy-storchaka · Jan 25, 2021 · Jun 22, 2019 · Mar 22, 2020 · Oct 31, 2020
commit 5749575ba5407e543d5427ea17ca64d9af086196
diff --git a/Doc/library/random.rst b/Doc/library/random.rst
@@ -145,7 +145,6 @@ Functions for integers
       or ``randrange('10')`` will be changed from :exc:`ValueError` to
       :exc:`TypeError`.
 
-
 .. function:: randint(a, b)
 
    Return a random integer *N* such that ``a <= N <= b``.  Alias for

diff --git a/Lib/random.py b/Lib/random.py
@@ -54,7 +54,6 @@
 from operator import index as _index
 from itertools import accumulate as _accumulate, repeat as _repeat
 from bisect import bisect as _bisect
-from operator import index as _index
 import os as _os
 import _random
 

diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
@@ -535,7 +535,6 @@ def test_randrange_errors(self):
         raises(3, 3)
         raises(-721)
         raises(0, 100, -12)
-        self.assertWarns(DeprecationWarning, raises, 3, 3, 1.0)
         # Non-integer start/stop
         self.assertWarns(DeprecationWarning, raises, 3.14159)
         self.assertWarns(DeprecationWarning, self.gen.randrange, 3.0)
@@ -547,10 +546,14 @@ def test_randrange_errors(self):
         self.assertWarns(DeprecationWarning, raises, 0, '2')
         # Zero and non-integer step
         raises(0, 42, 0)
+        self.assertWarns(DeprecationWarning, raises, 0, 42, 0.0)
+        self.assertWarns(DeprecationWarning, raises, 0, 0, 0.0)
         self.assertWarns(DeprecationWarning, raises, 0, 42, 3.14159)
         self.assertWarns(DeprecationWarning, self.gen.randrange, 0, 42, 3.0)
         self.assertWarns(DeprecationWarning, self.gen.randrange, 0, 42, Fraction(3, 1))
         self.assertWarns(DeprecationWarning, raises, 0, 42, '3')
+        self.assertWarns(DeprecationWarning, self.gen.randrange, 0, 42, 1.0)
+        self.assertWarns(DeprecationWarning, raises, 0, 0, 1.0)
 
     def test_randrange_argument_handling(self):
         randrange = self.gen.randrange

diff --git a/Misc/NEWS.d/next/Library/2020-03-22-21-33-31.bpo-37319.BrIAir.rst b/Misc/NEWS.d/next/Library/2020-03-22-21-33-31.bpo-37319.BrIAir.rst
diff --git a/Misc/NEWS.d/next/Library/2020-10-31-10-28-32.bpo-42222.Cfl1eR.rst b/Misc/NEWS.d/next/Library/2020-10-31-10-28-32.bpo-42222.Cfl1eR.rst
@@ -1,9 +1,9 @@
-Harmonized random.randrange() argument handling to match range().
+Harmonized :func:`random.randrange` argument handling to match :func:`range`.
 
-* The integer test and conversion in randrange() now uses
-  operator.index().
-* Non-integer arguments to randrange() are deprecated.
-* The *ValueError* is deprecated in favor of a *TypeError*.
+* The integer test and conversion in ``randrange()`` now uses
+  :func:`operator.index`.
+* Non-integer arguments to ``randrange()`` are deprecated.
+* The ``ValueError`` is deprecated in favor of a ``TypeError``.
 * It now runs a little faster than before.
 
 (Contributed by Raymond Hettinger and Serhiy Storchaka.)