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

[victor.stinner]

https://hg.python.org/cpython/rev/3e6792af95f0
changeset:   102067:3e6792af95f0
parent:      102065:27e7945c4ecd
parent:      102066:193f50babfa4
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Fri Jun 17 00:01:30 2016 +0200
summary:
  Merge 3.5

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


diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -134,7 +134,7 @@
     const int flags = GRND_NONBLOCK;
 
     char *dest;
-    int n;
+    long n;
 
     if (!getrandom_works)
         return 0;
@@ -146,7 +146,7 @@
            to 1024 bytes */
         n = Py_MIN(size, 1024);
 #else
-        n = Py_MIN(size, INT_MAX);
+        n = Py_MIN(size, LONG_MAX);
 #endif
 
         errno = 0;

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