merge

rhettinger · rhettinger · commit d58a0b6876bf · 2014-05-25T17:28:38.000-07:00
diff --git a/Lib/random.py b/Lib/random.py
@@ -355,7 +355,10 @@ def triangular(self, low=0.0, high=1.0, mode=None):
 
         """
         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
@@ -602,7 +602,7 @@ def test_constant(self):
         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),
