summaryrefslogtreecommitdiff
path: root/Lib
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2016-12-31 11:40:11 +0000
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2016-12-31 11:40:11 +0000
commitd489ac91020efcf7b76a9fed0a44891c334ba67e (patch)
treea0cbc56f0d2f317d39c9182d2e6f94a3ce91e7bb /Lib
parent8e9c42e8e827fd4212639671faec9cf4ff62b6e9 (diff)
downloadcpython-git-d489ac91020efcf7b76a9fed0a44891c334ba67e.tar.gz
Closes #28524: added default level for logging.disable().
Diffstat (limited to 'Lib')
-rw-r--r--Lib/logging/__init__.py2
-rw-r--r--Lib/test/test_logging.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 2590d6528f..d886d35c12 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1889,7 +1889,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.
"""
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 08cdd7f3eb..7c5d1fd63c 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3473,6 +3473,11 @@ class ModuleLevelMiscTest(BaseTest):
logging.disable(83)
self.assertEqual(logging.root.manager.disable, 83)
+ # test the default value introduced in 3.7
+ # (Issue #28524)
+ logging.disable()
+ self.assertEqual(logging.root.manager.disable, logging.CRITICAL)
+
def _test_log(self, method, level=None):
called = []
support.patch(self, logging, 'basicConfig',