From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 7 Sep 2012 21:49:07 +0000 (+0200)
Subject: Issue #15340: Fix importing the random module when /dev/urandom cannot be opened.
X-Git-Tag: v3.2.4rc1~565
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ff1822ec729fc389786683af886ea2f2b13cfbf;p=thirdparty%2FPython%2Fcpython.git

Issue #15340: Fix importing the random module when /dev/urandom cannot be opened.
This was a regression caused by the hash randomization patch.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index a1d35a4f1d32..065f5f61a495 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 a2ae002261ac..825260f36b2a 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;
     }