summaryrefslogtreecommitdiffstats
path: root/Doc/library/sys.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-10-15 16:42:37 (GMT)
committerGeorg Brandl <georg@python.org>2010-10-15 16:42:37 (GMT)
commitd0b0e1d8690f5c8534e129bac626175f31068b7a (patch)
tree539f293bab400cbc15e2499baf58d03dae4916df /Doc/library/sys.rst
parentd2413428dcf5b4ad3c5604319f694c36b13e96af (diff)
downloadcpython-d0b0e1d8690f5c8534e129bac626175f31068b7a.zip
cpython-d0b0e1d8690f5c8534e129bac626175f31068b7a.tar.gz
cpython-d0b0e1d8690f5c8534e129bac626175f31068b7a.tar.bz2
#6798: fix wrong docs for the arguments to several trace events.
Diffstat (limited to 'Doc/library/sys.rst')
-rw-r--r--Doc/library/sys.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 352eb62..0f35b8b 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -806,8 +806,9 @@ always available.
``'return'``
A function (or other code block) is about to return. The local trace
- function is called; *arg* is the value that will be returned. The trace
- function's return value is ignored.
+ function is called; *arg* is the value that will be returned, or ``None``
+ if the event is caused by an exception being raised. The trace function's
+ return value is ignored.
``'exception'``
An exception has occurred. The local trace function is called; *arg* is a
@@ -819,10 +820,10 @@ always available.
a built-in. *arg* is the C function object.
``'c_return'``
- A C function has returned. *arg* is ``None``.
+ A C function has returned. *arg* is the C function object.
``'c_exception'``
- A C function has raised an exception. *arg* is ``None``.
+ A C function has raised an exception. *arg* is the C function object.
Note that as an exception is propagated down the chain of callers, an
``'exception'`` event is generated at each level.