changeset 87661:eae4b83108fb

Closes #19789: Merged update from 3.3.
author Vinay Sajip <vinay_sajip@yahoo.co.uk>
date Sat, 30 Nov 2013 22:46:29 +0000
parents f20d966dc499 (current diff) 5c8130b85c17 (diff)
children f4eedd29706b
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Doc/library/logging.rst	Sat Nov 30 13:55:39 2013 -0800
+++ b/Doc/library/logging.rst	Sat Nov 30 22:46:29 2013 +0000
@@ -987,8 +987,10 @@
    effect is to disable all logging calls of severity *lvl* and below, so that
    if you call it with a value of INFO, then all INFO and DEBUG events would be
    discarded, whereas those of severity WARNING and above would be processed
-   according to the logger's effective level. To undo the effect of a call to
-   ``logging.disable(lvl)``, call ``logging.disable(logging.NOTSET)``.
+   according to the logger's effective level. If
+   ``logging.disable(logging.NOTSET)`` is called, it effectively removes this
+   overriding level, so that logging output again depends on the effective
+   levels of individual loggers.
 
 
 .. function:: addLevelName(lvl, levelName)