diff options
| author | Georg Brandl <georg@python.org> | 2010-11-26 07:34:20 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-11-26 07:34:20 (GMT) |
| commit | 78f11edf3f934461191d4cec81fb4f13811c2be2 (patch) | |
| tree | 0d89695787be0c415f9f246be6f47fe95161d980 /Doc/library/sys.rst | |
| parent | d8d884947bf4d592d0e0378ad9637175620292c6 (diff) | |
| download | cpython-78f11edf3f934461191d4cec81fb4f13811c2be2.zip cpython-78f11edf3f934461191d4cec81fb4f13811c2be2.tar.gz cpython-78f11edf3f934461191d4cec81fb4f13811c2be2.tar.bz2 | |
Merged revisions 85530,85534,85538,85540-85542 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85530 | georg.brandl | 2010-10-15 17:32:05 +0200 (Fr, 15 Okt 2010) | 1 line
Refrain from using inline suites.
........
r85534 | georg.brandl | 2010-10-15 18:19:43 +0200 (Fr, 15 Okt 2010) | 1 line
#9801: document how list and dict proxies created by Managers behave w.r.t. mutable items.
........
r85538 | georg.brandl | 2010-10-15 18:35:46 +0200 (Fr, 15 Okt 2010) | 1 line
#7303: add documentation for useful pkgutil functions and classes.
........
r85540 | georg.brandl | 2010-10-15 18:42:37 +0200 (Fr, 15 Okt 2010) | 1 line
#6798: fix wrong docs for the arguments to several trace events.
........
r85541 | georg.brandl | 2010-10-15 18:53:24 +0200 (Fr, 15 Okt 2010) | 1 line
#4968: updates to inspect.is* function docs.
........
r85542 | georg.brandl | 2010-10-15 19:01:15 +0200 (Fr, 15 Okt 2010) | 1 line
#7790: move table of struct_time members to the actual description of struct_time.
........
Diffstat (limited to 'Doc/library/sys.rst')
| -rw-r--r-- | Doc/library/sys.rst | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index 0661d7d..3997627 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -874,8 +874,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 @@ -887,10 +888,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. |