changeset:   105886:fc3eab44765f
parent:      105884:9de7bf6c60d2
parent:      105885:0a55e039d25f
user:        Benjamin Peterson <benjamin@python.org>
date:        Wed Dec 28 20:03:23 2016 -0800
files:       Misc/NEWS
description:
merge 3.6 (#29085)


diff -r 9de7bf6c60d2 -r fc3eab44765f Misc/NEWS
--- a/Misc/NEWS	Wed Dec 28 16:03:28 2016 -0800
+++ b/Misc/NEWS	Wed Dec 28 20:03:23 2016 -0800
@@ -734,6 +734,9 @@
 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()
diff -r 9de7bf6c60d2 -r fc3eab44765f Modules/_randommodule.c
--- a/Modules/_randommodule.c	Wed Dec 28 16:03:28 2016 -0800
+++ b/Modules/_randommodule.c	Wed Dec 28 20:03:23 2016 -0800
@@ -245,7 +245,7 @@
         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: