summaryrefslogtreecommitdiff
path: root/Lib/logging/__init__.py
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2017-02-04 16:46:53 -0800
committerSteve Dower <steve.dower@microsoft.com>2017-02-04 16:46:53 -0800
commitb1a1742796fce8078f9f1f3d5e3161122fae3b0a (patch)
tree89c863764481b7c7fbe645be42b16e1d35e92751 /Lib/logging/__init__.py
parent391ed6c73cb1964b57d0b538370a76d03d30511b (diff)
parentcf1f5444eb42a8dc252b295d3863288309996a5d (diff)
downloadcpython-b1a1742796fce8078f9f1f3d5e3161122fae3b0a.tar.gz
Merge from 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.
"""