mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #23207: logging.basicConfig() now does additional validation of its arguments.

Browse source
This commit is contained in:
Vinay Sajip 2015-01-23 19:52:21 +00:00
parent 71e7296016
commit 5abca7023c
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/logging/__init__.py
View file

@ -1723,7 +1723,7 @@ def basicConfig(**kwargs):
_acquireLock() _acquireLock()
try: try:
if len(root.handlers) == 0: if len(root.handlers) == 0:
handlers = kwargs.get("handlers") handlers = kwargs.pop("handlers", None)
if handlers is None: if handlers is None:
if "stream" in kwargs and "filename" in kwargs: if "stream" in kwargs and "filename" in kwargs:
raise ValueError("'stream' and 'filename' should not be " raise ValueError("'stream' and 'filename' should not be "
@ -1733,28 +1733,31 @@ def basicConfig(**kwargs):
raise ValueError("'stream' or 'filename' should not be " raise ValueError("'stream' or 'filename' should not be "
"specified together with 'handlers'") "specified together with 'handlers'")
if handlers is None: if handlers is None:
filename = kwargs.get("filename") filename = kwargs.pop("filename", None)
if filename: if filename:
mode = kwargs.get("filemode", 'a') mode = kwargs.pop("filemode", 'a')
h = FileHandler(filename, mode) h = FileHandler(filename, mode)
else: else:
stream = kwargs.get("stream") stream = kwargs.pop("stream", None)
h = StreamHandler(stream) h = StreamHandler(stream)
handlers = [h] handlers = [h]
dfs = kwargs.get("datefmt", None) dfs = kwargs.pop("datefmt", None)
style = kwargs.get("style", '%') style = kwargs.pop("style", '%')
if style not in _STYLES: if style not in _STYLES:
raise ValueError('Style must be one of: %s' % ','.join( raise ValueError('Style must be one of: %s' % ','.join(
_STYLES.keys())) _STYLES.keys()))
fs = kwargs.get("format", _STYLES[style][1]) fs = kwargs.pop("format", _STYLES[style][1])
fmt = Formatter(fs, dfs, style) fmt = Formatter(fs, dfs, style)
for h in handlers: for h in handlers:
if h.formatter is None: if h.formatter is None:
h.setFormatter(fmt) h.setFormatter(fmt)
root.addHandler(h) root.addHandler(h)
level = kwargs.get("level") level = kwargs.pop("level", None)
if level is not None: if level is not None:
root.setLevel(level) root.setLevel(level)
if kwargs:
keys = ', '.join(kwargs.keys())
raise ValueError('Unrecognised argument(s): %s' % keys)
finally: finally:
_releaseLock() _releaseLock()