[Python-checkins] cpython (2.7): Improve doc for atexit.register (#12297)
eric.araujo
python-checkins at python.org
Wed Feb 15 17:15:55 CET 2012
http://hg.python.org/cpython/rev/a99632426af5
changeset: 74951:a99632426af5
branch: 2.7
user: Éric Araujo <merwok at netwok.org>
date: Wed Feb 15 17:08:34 2012 +0100
summary:
Improve doc for atexit.register (#12297)
files:
Doc/library/atexit.rst | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst
--- a/Doc/library/atexit.rst
+++ b/Doc/library/atexit.rst
@@ -26,7 +26,7 @@
.. index:: single: exitfunc (in sys)
This is an alternate interface to the functionality provided by the
-``sys.exitfunc`` variable.
+:func:`sys.exitfunc` variable.
Note: This module is unlikely to work correctly when used with other code that
sets ``sys.exitfunc``. In particular, other core Python modules are free to use
@@ -40,7 +40,8 @@
Register *func* as a function to be executed at termination. Any optional
arguments that are to be passed to *func* must be passed as arguments to
- :func:`register`.
+ :func:`register`. It is possible to register the same function and arguments
+ more than once.
At normal program termination (for instance, if :func:`sys.exit` is called or
the main module's execution completes), all functions registered are called in
@@ -54,8 +55,8 @@
be raised is re-raised.
.. versionchanged:: 2.6
- This function now returns *func* which makes it possible to use it as a
- decorator without binding the original name to ``None``.
+ This function now returns *func*, which makes it possible to use it as a
+ decorator.
.. seealso::
@@ -109,5 +110,4 @@
def goodbye():
print "You are now leaving the Python sector."
-This obviously only works with functions that don't take arguments.
-
+This only works with functions that can be called without arguments.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list