summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-11-05 19:55:02 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-11-05 19:55:02 (GMT)
commit6b1167c61cb3e1e05b4b310fa9c9cddff93afa27 (patch)
tree99065a8c301d23274ce8883bc4e2dc479dfe6613 /Misc
parent51c9b5152aca58066b7f35a9c6c419cadf270b6c (diff)
downloadcpython-6b1167c61cb3e1e05b4b310fa9c9cddff93afa27.zip
cpython-6b1167c61cb3e1e05b4b310fa9c9cddff93afa27.tar.gz
cpython-6b1167c61cb3e1e05b4b310fa9c9cddff93afa27.tar.bz2
Merged revisions 86214 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86214 | antoine.pitrou | 2010-11-05 20:47:27 +0100 (ven., 05 nov. 2010) | 4 lines Issue #10311: The signal module now restores errno before returning from its low-level signal handler. Patch by Hallvard B Furuseth. ........
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index b1bf91c..28850b0 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -268,6 +268,7 @@ Peter Funk
Geoff Furnish
Ulisses Furquim
Hagen Fürstenau
+Hallvard B Furuseth
Achim Gaedke
Martin von Gagern
Lele Gaifax
diff --git a/Misc/NEWS b/Misc/NEWS
index a667fa3..698c971 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -69,6 +69,9 @@ Core and Builtins
Library
-------
+- Issue #10311: The signal module now restores errno before returning from
+ its low-level signal handler. Patch by Hallvard B Furuseth.
+
- Issue #10038: json.loads() on str should always return unicode (regression
from Python 2.6). Patch by Walter Dörwald.