[Python-checkins] cpython (merge 3.4 -> default): merge

raymond.hettinger python-checkins at python.org
Mon May 26 02:28:48 CEST 2014


http://hg.python.org/cpython/rev/3985104e2290
changeset:   90832:3985104e2290
parent:      90830:408cc455829d
parent:      90831:7ea6c8eb91e2
user:        Raymond Hettinger <python at rcn.com>
date:        Sun May 25 17:28:38 2014 -0700
summary:
  merge

files:
  Lib/random.py           |  5 ++++-
  Lib/test/test_random.py |  2 +-
  2 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Lib/random.py b/Lib/random.py
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -355,7 +355,10 @@
 
         """
         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
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -602,7 +602,7 @@
         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),

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list