summaryrefslogtreecommitdiff
path: root/Lib/logging/__init__.py
diff options
context:
space:
mode:
authordoko <doko@ubuntu.com>2017-02-01 13:02:16 +0100
committerdoko <doko@ubuntu.com>2017-02-01 13:02:16 +0100
commit2e835c97b60f5f554ea4742abc1c0f801567f1b9 (patch)
treee57b9697de6321a39541c2e947940e275ca844d3 /Lib/logging/__init__.py
parentba5a055a00d91a449a23ae14dd468e9b769a6b74 (diff)
parent75a56cd1847142d9c893b6df5fb674f54b34d9ed (diff)
downloadcpython-2e835c97b60f5f554ea4742abc1c0f801567f1b9.tar.gz
Merge 3.6
Diffstat (limited to 'Lib/logging/__init__.py')
-rw-r--r--Lib/logging/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index b44a3b2228..49a069255f 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1894,7 +1894,7 @@ def log(level, msg, *args, **kwargs):
basicConfig()
root.log(level, msg, *args, **kwargs)
-def disable(level):
+def disable(level=CRITICAL):
"""
Disable all logging calls of severity 'level' and below.
"""