[Python-checkins] cpython (merge 3.2 -> default): Closes #13459: Merged fix from 3.2.

[vinay.sajip]

http://hg.python.org/cpython/rev/cc6693fdf6d5
changeset:   73724:cc6693fdf6d5
parent:      73721:958a4678377a
parent:      73723:a9f5639e18a1
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Wed Nov 23 08:55:59 2011 +0000
summary:
  Closes #13459: Merged fix from 3.2.

files:
  Doc/library/logging.rst |  12 +++++++++---
  1 files changed, 9 insertions(+), 3 deletions(-)


diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -57,9 +57,15 @@
 
 .. 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)

-- 
Repository URL: http://hg.python.org/cpython