summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
Diffstat (limited to 'Lib')
-rw-r--r--Lib/random.py10
-rw-r--r--Lib/test/test_random.py29
2 files changed, 1 insertions, 38 deletions
diff --git a/Lib/random.py b/Lib/random.py
index 2fa9887..b183f56 100644
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -345,16 +345,6 @@ class Random(_random.Random):
http://en.wikipedia.org/wiki/Triangular_distribution
"""
- # Sanity check. According to the doc low must be less or equal to
- # high. And mode should be somewhere between these bounds.
- if low > high:
- raise ValueError('high cannot be less then low.')
- if mode is not None and (mode < low or mode > high):
- raise ValueError('mode must be between low and high.')
-
- if high == low:
- return low
-
u = self.random()
c = 0.5 if mode is None else (mode - low) / (high - low)
if u > c:
diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
index fa03073..437a20f 100644
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -48,33 +48,6 @@ class TestBasicOps(unittest.TestCase):
self.assertRaises(TypeError, self.gen.seed, 1, 2, 3, 4)
self.assertRaises(TypeError, type(self.gen), [])
- def test_triangular(self):
- # Check that triangular() correctly handles bad input. See issue 13355.
- # mode > high.
- with self.assertRaises(ValueError):
- random.triangular(mode=2)
- with self.assertRaises(ValueError):
- random.triangular(low=1, high=10, mode=11)
- with self.assertRaises(ValueError):
- random.triangular(low=1, high=1, mode=11)
- # mode < low.
- with self.assertRaises(ValueError):
- random.triangular(mode=-1)
- with self.assertRaises(ValueError):
- random.triangular(low=1, high=10, mode=0)
- with self.assertRaises(ValueError):
- random.triangular(low=1, high=1, mode=0)
- # low > high
- with self.assertRaises(ValueError):
- random.triangular(low=5, high=2)
- with self.assertRaises(ValueError):
- random.triangular(low=5, high=2, mode=1)
- with self.assertRaises(ValueError):
- random.triangular(low=-2, high=-5)
-
- self.assertEqual(random.triangular(low=10, high=10), 10)
- self.assertEqual(random.triangular(low=10, high=10, mode=10), 10)
-
@unittest.mock.patch('random._urandom') # os.urandom
def test_seed_when_randomness_source_not_found(self, urandom_mock):
# Random.seed() uses time.time() when an operating system specific
@@ -623,7 +596,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),