summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-08-01 18:49:24 (GMT)
committerGeorg Brandl <georg@python.org>2006-08-01 18:49:24 (GMT)
commit07fec3aa5a7c9fb6b1f8bae6bf6773892a702ea0 (patch)
tree75a1a8b215e3266dcfc0fd5bba2530709e276eae
parent86e1e38059c7f2a1d8bdc4123a1600bc7b7a0f79 (diff)
downloadcpython-07fec3aa5a7c9fb6b1f8bae6bf6773892a702ea0.zip
cpython-07fec3aa5a7c9fb6b1f8bae6bf6773892a702ea0.tar.gz
cpython-07fec3aa5a7c9fb6b1f8bae6bf6773892a702ea0.tar.bz2
os.urandom no longer masks unrelated exceptions like SystemExit or
KeyboardInterrupt.
-rw-r--r--Lib/os.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/os.py b/Lib/os.py
index 31002ac..2d1b29b 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -723,7 +723,7 @@ if not _exists("urandom"):
"""
try:
_urandomfd = open("/dev/urandom", O_RDONLY)
- except:
+ except (OSError, IOError):
raise NotImplementedError("/dev/urandom (or equivalent) not found")
bytes = ""
while len(bytes) < n:
diff --git a/Misc/NEWS b/Misc/NEWS
index 9eeeff8..b498cc3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -61,6 +61,9 @@ Core and builtins
Library
-------
+- os.urandom no longer masks unrelated exceptions like SystemExit or
+ KeyboardInterrupt.
+
- Bug #1525866: Don't copy directory stat times in
shutil.copytree on Windows