merge

2016-12-27 01:07:13 -08:00 · 2016-12-27 01:07:13 -08:00 · f45e858c60
parent 426b140fc5 bb2839b680
commit f45e858c60
2 changed files with 4 additions and 1 deletions
--- a/Lib/random.py
+++ b/Lib/random.py
@ -254,7 +254,7 @@ class Random(_random.Random):
        try:
            i = self._randbelow(len(seq))
        except ValueError:
-            raise IndexError('Cannot choose from an empty sequence')
+            raise IndexError('Cannot choose from an empty sequence') from None
        return seq[i]

    def shuffle(self, x, random=None):
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -714,6 +714,9 @@ Library

 - Issue 28923: Remove editor artifacts from Tix.py.

+- Issue #29055:  Neaten-up empty population error on random.choice()
+  by suppressing the upstream exception.
+
 - Issue #28871: Fixed a crash when deallocate deep ElementTree.

 - Issue #19542: Fix bugs in WeakValueDictionary.setdefault() and