Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge

This commit is contained in:
Raymond Hettinger 2016-11-01 22:23:34 -07:00
parent 94d73e94a1 8567e58ae3
commit 79a188c2bb
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/random.py
View File

@ -350,8 +350,7 @@ class Random(_random.Random):
_int = int _int = int
total = len(population) total = len(population)
return [population[_int(random() * total)] for i in range(k)] return [population[_int(random() * total)] for i in range(k)]
else: cum_weights = list(_itertools.accumulate(weights))
cum_weights = list(_itertools.accumulate(weights))
elif weights is not None: 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): if len(cum_weights) != len(population):