Mercurial > cpython-lru_cache-weakref
changeset 87668:9ca47b3babe5 2.7
Merge heads.
| author | Alexandre Vassalotti <alexandre@peadrop.com> |
|---|---|
| date | Sat, 30 Nov 2013 16:56:36 -0800 |
| parents | fbb97f6eb3b3 (current diff) b6377ca8087a (diff) |
| children | d964d7023aa4 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Doc/library/logging.rst Sat Nov 30 16:52:03 2013 -0800 +++ b/Doc/library/logging.rst Sat Nov 30 16:56:36 2013 -0800 @@ -837,8 +837,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)