Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-04-05 03:21:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge 3.6 (#29085)

Browse source
This commit is contained in:
Benjamin Peterson 2016-12-28 20:03:23 -08:00
commit e70ca463eb
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -734,6 +734,9 @@ Core and Builtins
Library
-------
- Issue #29085: Allow random.Random.seed() to use high quality OS randomness
rather than the pid and time.
- Issue 28923: Remove editor artifacts from Tix.py.
- Issue #29055: Neaten-up empty population error on random.choice()

2
Modules/_randommodule.c
View file

@ -245,7 +245,7 @@ random_seed(RandomObject *self, PyObject *args)
return NULL;
if (arg == NULL || arg == Py_None) {
if (random_seed_urandom(self) >= 0) {
if (random_seed_urandom(self) < 0) {
PyErr_Clear();
/* Reading system entropy failed, fall back on the worst entropy: