summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-09-07 21:49:07 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-09-07 21:49:07 (GMT)
commit380c55cc58911a4777f080744f596d1e96fd2357 (patch)
treef68d1b5d4e28c98b865ac0a06a965973f40057d8
parent0398985920dcad1fcff0859e18a5911a6c685ff1 (diff)
downloadcpython-380c55cc58911a4777f080744f596d1e96fd2357.zip
cpython-380c55cc58911a4777f080744f596d1e96fd2357.tar.gz
cpython-380c55cc58911a4777f080744f596d1e96fd2357.tar.bz2
Issue #15340: Fix importing the random module when /dev/urandom cannot be opened.
This was a regression caused by the hash randomization patch.
-rw-r--r--Misc/NEWS3
-rw-r--r--Python/random.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 04a98ab..946ac46 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,9 @@ Core and Builtins
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 #15785: Modify window.get_wch() API of the curses module: return
a character for most keys, and an integer for special keys, instead of
always returning an integer. So it is now possible to distinguish special
diff --git a/Python/random.c b/Python/random.c
index 7019a35..53518c2 100644
--- a/Python/random.c
+++ b/Python/random.c
@@ -165,7 +165,8 @@ dev_urandom_python(char *buffer, Py_ssize_t size)
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;
}