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.3.0rc2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=380c55cc58911a4777f080744f596d1e96fd2357;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 04a98abf81a3..946ac46467a4 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 7019a3503e8f..53518c2ebec6 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;
     }