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

[raymond.hettinger]

https://hg.python.org/cpython/rev/c6228efa7c41
changeset:   103059:c6228efa7c41
parent:      103055:8c6c91983d64
parent:      103058:096b712cc129
user:        Raymond Hettinger <python at rcn.com>
date:        Mon Sep 05 13:15:20 2016 -0700
summary:
  Merge

files:
  Doc/library/random.rst |  6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Doc/library/random.rst b/Doc/library/random.rst
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -329,6 +329,9 @@
 
     >>> weighted_choices = [('Red', 3), ('Blue', 2), ('Yellow', 1), ('Green', 4)]
     >>> population = [val for val, cnt in weighted_choices for i in range(cnt)]
+    >>> population
+    ['Red', 'Red', 'Red', 'Blue', 'Blue', 'Yellow', 'Green', 'Green', 'Green', 'Green']
+
     >>> random.choice(population)
     'Green'
 
@@ -338,6 +341,9 @@
 
     >>> choices, weights = zip(*weighted_choices)
     >>> cumdist = list(itertools.accumulate(weights))
+    >>> cumdist            # [3, 3+2, 3+2+1, 3+2+1+4]
+    [3, 5, 6, 10]
+
     >>> x = random.random() * cumdist[-1]
     >>> choices[bisect.bisect(cumdist, x)]
     'Blue'

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