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

[victor.stinner]

https://hg.python.org/cpython/rev/e885f3f00256
changeset:   98457:e885f3f00256
parent:      98453:710ef035ee44
parent:      98456:8165c7460596
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Thu Oct 01 10:01:31 2015 +0200
summary:
  Merge 3.5

files:
  Python/random.c |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -111,6 +111,8 @@
 
 #else
 
+/* Issue #25003: Don' use getentropy() on Solaris (available since
+ * Solaris 11.3), it is blocking whereas os.urandom() should not block. */
 #if defined(HAVE_GETRANDOM) || defined(HAVE_GETRANDOM_SYSCALL)
 #define PY_GETRANDOM 1
 

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