diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2013-12-01 00:56:36 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2013-12-01 00:56:36 (GMT) |
| commit | c6df622c4cc9be85764ab55e9e0ac230fe487efb (patch) | |
| tree | a35b4fcbf4ca201c4ff5264abda9653158a966d0 | |
| parent | a2934280e56dfca6ec74a6ce8392b5496592ab93 (diff) | |
| parent | e9cb5e9df6d828156aae02ec4618bafbb8b35434 (diff) | |
| download | cpython-c6df622c4cc9be85764ab55e9e0ac230fe487efb.zip cpython-c6df622c4cc9be85764ab55e9e0ac230fe487efb.tar.gz cpython-c6df622c4cc9be85764ab55e9e0ac230fe487efb.tar.bz2 | |
Merge heads.
| -rw-r--r-- | Doc/library/logging.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index f3fda14..68e359e 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -837,8 +837,10 @@ functions. 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) |