summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2009-06-21 17:37:27 +0000
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2009-06-21 17:37:27 +0000
commit603fb6d66759afe8b5f65f2d456a43e73bb89233 (patch)
tree175a35f50e0e16c81461e2046778babab3af40d1
parent7f146ab0ca5443a54f575b24965106a0e967a9dc (diff)
downloadcpython-git-603fb6d66759afe8b5f65f2d456a43e73bb89233.tar.gz
Issue #6314: logging.basicConfig() performs extra checks on the "level" argument.
-rw-r--r--Lib/logging/__init__.py4
-rw-r--r--Misc/NEWS5
2 files changed, 8 insertions, 1 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 456dec906a..23f7930b69 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1397,6 +1397,10 @@ def basicConfig(**kwargs):
root.addHandler(hdlr)
level = kwargs.get("level")
if level is not None:
+ if str(level) == level: # If a string was passed, do more checks
+ if level not in _levelNames:
+ raise ValueError("Unknown level: %r" % level)
+ level = _levelNames[level]
root.setLevel(level)
#---------------------------------------------------------------------------
diff --git a/Misc/NEWS b/Misc/NEWS
index 86666ffaa2..2985c3aa70 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -327,7 +327,10 @@ Core and Builtins
Library
-------
-- Issue #6164: Added an AIX specific linker argument in Distutils
+- Issue #6314: logging.basicConfig() performs extra checks on the "level"
+ argument.
+
+- Issue #6164: Added an AIX specific linker argument in Distutils
unixcompiler. Original patch by Sridhar Ratnakumar.
- Issue #6274: Fixed possible file descriptors leak in subprocess.py