summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-08-02 06:46:21 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-08-02 06:46:21 (GMT)
commit9b0ca79213f262daab54db21d6f3aa17b8dd86dd (patch)
tree07e79ed0e6c833b954f0e89b0b114b2c7fa5a432 /Misc
parent3ee5941f68fea95116e30a78fb0cc2fb359c48ea (diff)
downloadcpython-9b0ca79213f262daab54db21d6f3aa17b8dd86dd.zip
cpython-9b0ca79213f262daab54db21d6f3aa17b8dd86dd.tar.gz
cpython-9b0ca79213f262daab54db21d6f3aa17b8dd86dd.tar.bz2
Patch #1519025 and bug #926423: If a KeyboardInterrupt occurs during
a socket operation on a socket with a timeout, the exception will be caught correctly. Previously, the exception was not caught.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index d35fb70..e13b594 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -435,6 +435,7 @@ Michael Muller
Takahiro Nakayama
Travers Naran
Fredrik Nehr
+Tony Nelson
Chad Netzer
Max Neunhöffer
George Neville-Neil
diff --git a/Misc/NEWS b/Misc/NEWS
index 81f7ca4..0d05e03 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -140,6 +140,10 @@ Library
Extension Modules
-----------------
+- Patch #1519025 and bug #926423: If a KeyboardInterrupt occurs during
+ a socket operation on a socket with a timeout, the exception will be
+ caught correctly. Previously, the exception was not caught.
+
- Patch #1529514: The _ctypes extension is now compiled on more
openbsd target platforms.