[Python-checkins] cpython (merge 3.2 -> default): Issue #15340: Fix importing the random module when /dev/urandom cannot be

Fri Sep 7 23:56:08 CEST 2012

http://hg.python.org/cpython/rev/a53fc9982e2a
changeset: 78874:a53fc9982e2a
parent: 78872:c82e3a6553fc
parent: 78873:2e8b01583839
user: Antoine Pitrou <solipsis at pitrou.net>
date: Fri Sep 07 23:51:22 2012 +0200
summary:
 Issue #15340: Fix importing the random module when /dev/urandom cannot be opened.
This was a regression caused by the hash randomization patch.
files:
 Misc/NEWS | 3 +++
 Python/random.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -88,6 +88,9 @@
 Library
 -------
 
+- Issue #15340: Fix importing the random module when /dev/urandom cannot
+ be opened. This was a regression caused by the hash randomization patch.
+
 - Issue #15828: Restore support for C extensions in imp.load_module()
 
 - Issue #10650: Deprecate the watchexp parameter of the Decimal.quantize()
diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -165,7 +165,8 @@
 Py_END_ALLOW_THREADS
 if (fd < 0)
 {
- PyErr_SetFromErrnoWithFilename(PyExc_OSError, "/dev/urandom");
+ PyErr_SetString(PyExc_NotImplementedError,
+ "/dev/urandom (or equivalent) not found");
 return -1;
 }
 
-- 
Repository URL: http://hg.python.org/cpython
