Issue #15340: Fix importing the random module when /dev/urandom cannot be opened.

pitrou · pitrou · commit 380c55cc5891 · 2012-09-07T23:49:07.000+02:00
This was a regression caused by the hash randomization patch.
diff --git 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
@@ -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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,8 @@ dev_urandom_python(char *buffer, Py_ssize_t size)`
`165`	`165`	`Py_END_ALLOW_THREADS`
`166`	`166`	`if (fd < 0)`
`167`	`167`	`{`
`168`		`- PyErr_SetFromErrnoWithFilename(PyExc_OSError, "/dev/urandom");`
	`168`	`+ PyErr_SetString(PyExc_NotImplementedError,`
	`169`	`+ "/dev/urandom (or equivalent) not found");`
`169`	`170`	`return -1;`
`170`	`171`	`}`
`171`	`172`