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)
commit7ff1822ec729fc389786683af886ea2f2b13cfbf (patch)
tree3a42b59a10a98551539b063ef5bd6d2b720c8681
parent5f381210c464b044b5d1d931db08d68ce04038e4 (diff)
downloadcpython-7ff1822ec729fc389786683af886ea2f2b13cfbf.zip
cpython-7ff1822ec729fc389786683af886ea2f2b13cfbf.tar.gz
cpython-7ff1822ec729fc389786683af886ea2f2b13cfbf.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 a1d35a4..065f5f6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -120,6 +120,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 #15841: The readable(), writable() and seekable() methods of BytesIO
and StringIO objects now raise ValueError when the object has been closed.
Patch by Alessandro Moura.
diff --git a/Python/random.c b/Python/random.c
index a2ae002..825260f 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;
}