summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-10-06 19:23:26 (GMT)
committerGeorg Brandl <georg@python.org>2013-10-06 19:23:26 (GMT)
commit7c679514a506c485240e917c52e49a59e02bd122 (patch)
treeef6cbede16a367416692dc6f3c289de43953f6f8
parent6d7d6cf76ec090ef776e70e6591215c8213e012e (diff)
parentc377fe2b968f8e1a5f276063a41cd4df75d4af2f (diff)
downloadcpython-7c679514a506c485240e917c52e49a59e02bd122.zip
cpython-7c679514a506c485240e917c52e49a59e02bd122.tar.gz
cpython-7c679514a506c485240e917c52e49a59e02bd122.tar.bz2
merge with 3.3
-rw-r--r--Doc/library/signal.rst6
-rw-r--r--Misc/ACKS1
2 files changed, 6 insertions, 1 deletions
diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst
index 2a472fe..84e2836 100644
--- a/Doc/library/signal.rst
+++ b/Doc/library/signal.rst
@@ -36,7 +36,11 @@ at a later point(for example at the next :term:`bytecode` instruction).
This has consequences:
* It makes little sense to catch synchronous errors like :const:`SIGFPE` or
- :const:`SIGSEGV`.
+ :const:`SIGSEGV` that are caused by an invalid operation in C code. Python
+ will return from the signal handler to the C code, which is likely to raise
+ the same signal again, causing Python to apparently hang. From Python 3.3
+ onwards, you can use the :mod:`faulthandler` module to report on synchronous
+ errors.
* A long-running calculation implemented purely in C (such as regular
expression matching on a large body of text) may run uninterrupted for an
diff --git a/Misc/ACKS b/Misc/ACKS
index 1e06e49..1d34956 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1011,6 +1011,7 @@ Ariel Poliak
Guilherme Polo
Illia Polosukhin
Michael Pomraning
+Martin Pool
Iustin Pop
Claudiu Popa
John Popplewell