mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Be consistent about the use of from-imports in random module (GH-11837)

Browse source 
Minor code clean-up.
This commit is contained in:
Raymond Hettinger 2019-02-13 02:04:17 -08:00 • committed by Miss Islington (bot)
parent 73d600239b
commit cfd31f0af2
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/random.py
View file

@ -43,8 +43,8 @@ from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin
from os import urandom as _urandom from os import urandom as _urandom
from _collections_abc import Set as _Set, Sequence as _Sequence from _collections_abc import Set as _Set, Sequence as _Sequence
from hashlib import sha512 as _sha512 from hashlib import sha512 as _sha512
import itertools as _itertools from itertools import accumulate as _accumulate
import bisect as _bisect from bisect import bisect as _bisect
import os as _os import os as _os
__all__ = ["Random","seed","random","uniform","randint","choice","sample", __all__ = ["Random","seed","random","uniform","randint","choice","sample",
@ -390,12 +390,12 @@ class Random(_random.Random):
_int = int _int = int
n += 0.0 # convert to float for a small speed improvement n += 0.0 # convert to float for a small speed improvement
return [population[_int(random() * n)] for i in range(k)] return [population[_int(random() * n)] for i in range(k)]
cum_weights = list(_itertools.accumulate(weights)) cum_weights = list(_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) != n: if len(cum_weights) != n:
raise ValueError('The number of weights does not match the population') raise ValueError('The number of weights does not match the population')
bisect = _bisect.bisect bisect = _bisect
total = cum_weights[-1] + 0.0 # convert to float total = cum_weights[-1] + 0.0 # convert to float
hi = n - 1 hi = n - 1
return [population[bisect(cum_weights, random() * total, 0, hi)] return [population[bisect(cum_weights, random() * total, 0, hi)]