Issue 13355: Make random.triangular degrade gracefully when low == high.

diff --git a/Lib/random.py b/Lib/random.py
index 174e755a0297b9379efad7d45f2063d803ee6340..464292876b49cea2df604934b568dd1d4a1e1fdf 100644 (file)
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -355,7 +355,10 @@ class Random(_random.Random):
 
         """
         u = self.random()
-        c = 0.5 if mode is None else (mode - low) / (high - low)
+        try:
+            c = 0.5 if mode is None else (mode - low) / (high - low)
+        except ZeroDivisionError:
+            return low
         if u > c:
             u = 1.0 - u
             c = 1.0 - c

diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
index 37a222d6224fb7698adb75826122f2be665bfbe5..103d462c6411850aa6fb09adbd478af8780a1f73 100644 (file)
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -602,7 +602,7 @@ class TestDistributions(unittest.TestCase):
         for variate, args, expected in [
                 (g.uniform, (10.0, 10.0), 10.0),
                 (g.triangular, (10.0, 10.0), 10.0),
-                #(g.triangular, (10.0, 10.0, 10.0), 10.0),
+                (g.triangular, (10.0, 10.0, 10.0), 10.0),
                 (g.expovariate, (float('inf'),), 0.0),
                 (g.vonmisesvariate, (3.0, float('inf')), 3.0),
                 (g.gauss, (10.0, 0.0), 10.0),

diff --git a/Misc/NEWS b/Misc/NEWS
index 05230daf248c52ae0eb1a3d786743db9ec1241a7..950040b47aa9ced7cd222803fb477ee5ec7af42f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,9 @@ Library
 - Issue #14710: pkgutil.find_loader() no longer raises an exception when a
   module doesn't exist.
 
+- Issue #13355: random.triangular() no longer fails with a ZeroDivisionError
+  when low equals high.
+
 - Issue #21538: The plistlib module now supports loading of binary plist files
   when reference or offset size is not a power of two.