summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2011-11-23 08:55:59 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2011-11-23 08:55:59 (GMT)
commitce378d1945c4991832ae08770d18fdf00bb9a25f (patch)
tree85c745b515d9db46c851fcae6c3249c2e373140a
parent759345ff8df1c6b106c64058517a2dd76f07c289 (diff)
parent287f24691dd8bda7f8acfebdda3201c738d67533 (diff)
downloadcpython-ce378d1945c4991832ae08770d18fdf00bb9a25f.zip
cpython-ce378d1945c4991832ae08770d18fdf00bb9a25f.tar.gz
cpython-ce378d1945c4991832ae08770d18fdf00bb9a25f.tar.bz2
Closes #13459: Merged fix from 3.2.
-rw-r--r--Doc/library/logging.rst12
1 files changed, 9 insertions, 3 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index d318948..859d275 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -57,9 +57,15 @@ instantiated directly, but always through the module-level function
.. attribute:: Logger.propagate
- If this evaluates to false, logging messages are not passed by this logger or by
- its child loggers to the handlers of higher level (ancestor) loggers. The
- constructor sets this attribute to 1.
+ If this evaluates to true, logging messages are passed by this logger and by
+ its child loggers to the handlers of higher level (ancestor) loggers.
+ Messages are passed directly to the ancestor loggers' handlers - neither the
+ level nor filters of the ancestor loggers in question are considered.
+
+ If this evaluates to false, logging messages are not passed to the handlers
+ of ancestor loggers.
+
+ The constructor sets this attribute to 1.
.. method:: Logger.setLevel(lvl)