diff options
author | doko <doko@ubuntu.com> | 2017-02-01 13:02:16 +0100 |
---|---|---|
committer | doko <doko@ubuntu.com> | 2017-02-01 13:02:16 +0100 |
commit | 2e835c97b60f5f554ea4742abc1c0f801567f1b9 (patch) | |
tree | e57b9697de6321a39541c2e947940e275ca844d3 /Doc/library/logging.rst | |
parent | ba5a055a00d91a449a23ae14dd468e9b769a6b74 (diff) | |
parent | 75a56cd1847142d9c893b6df5fb674f54b34d9ed (diff) | |
download | cpython-2e835c97b60f5f554ea4742abc1c0f801567f1b9.tar.gz |
Merge 3.6
Diffstat (limited to 'Doc/library/logging.rst')
-rw-r--r-- | Doc/library/logging.rst | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index 6098878c1a..d03cc50d87 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -1023,7 +1023,7 @@ functions. handlers being added multiple times to the root logger, which can in turn lead to multiple messages for the same event. -.. function:: disable(lvl) +.. function:: disable(lvl=CRITICAL) Provides an overriding level *lvl* for all loggers which takes precedence over the logger's own level. When the need arises to temporarily throttle logging @@ -1036,6 +1036,14 @@ functions. overriding level, so that logging output again depends on the effective levels of individual loggers. + Note that if you have defined any custom logging level higher than + ``CRITICAL`` (this is not recommended), you won't be able to rely on the + default value for the *lvl* parameter, but will have to explicitly supply a + suitable value. + + .. versionchanged:: 3.7 + The *lvl* parameter was defaulted to level ``CRITICAL``. See Issue + #28524 for more information about this change. .. function:: addLevelName(lvl, levelName) |