]> granicus.if.org Git - python/commitdiff
Issue #15340: Fix importing the random module when /dev/urandom cannot be opened.
authorAntoine Pitrou <solipsis@pitrou.net>
Fri, 7 Sep 2012 21:49:07 +0000 (23:49 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Fri, 7 Sep 2012 21:49:07 +0000 (23:49 +0200)
This was a regression caused by the hash randomization patch.

Misc/NEWS
Python/random.c

index b080c1e9c288f651867b221fbabbd697bd091323..e02e1d774c7e22122ab28e0fed429b103645bd34 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,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
   io.BytesIO and io.StringIO objects now raise ValueError when the object has
   been closed.  Patch by Alessandro Moura.
index a2ae002261acdc5875b47d8193ed8bd7a628821f..825260f36b2ad80aa1998125f8dd41da711e4c34 100644 (file)
@@ -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;
     }