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

Sun Nov 13 00:44:29 EST 2016

https://hg.python.org/cpython/rev/51d07aaa70ef
changeset: 105082:51d07aaa70ef
parent: 105080:b31a7efd8b31
parent: 105081:8820387f2667
user: Raymond Hettinger <python at rcn.com>
date: Sun Nov 13 00:44:24 2016 -0500
summary:
 merge
files:
 Lib/random.py | 2 +-
 Lib/test/test_random.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/random.py b/Lib/random.py
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -352,7 +352,7 @@
 return [population[_int(random() * total)] for i in range(k)]
 cum_weights = list(_itertools.accumulate(weights))
 elif weights is not None:
- raise TypeError('Cannot specify both weights and cumulative_weights')
+ raise TypeError('Cannot specify both weights and cumulative weights')
 if len(cum_weights) != len(population):
 raise ValueError('The number of weights does not match the population')
 bisect = _bisect.bisect
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
@@ -626,7 +626,7 @@
 self.assertEqual((x+stop)%step, 0)
 
 def test_choices_algorithms(self):
- # The various ways of specifing weights should produce the same results
+ # The various ways of specifying weights should produce the same results
 choices = self.gen.choices
 n = 13132817
 
-- 
Repository URL: https://hg.python.org/cpython
