traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #23207: merged fix from 3.4.

This commit is contained in:
Vinay Sajip 2015-03-18 08:49:57 +00:00
parent e42ccd2bfd d55436ace3
commit 3505bd82a9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/logging/__init__.py
View File

@ -1734,8 +1734,8 @@ def basicConfig(**kwargs):
"specified together with 'handlers'")
if handlers is None:
filename = kwargs.pop("filename", None)
mode = kwargs.pop("filemode", 'a')
if filename:
mode = kwargs.pop("filemode", 'a')
h = FileHandler(filename, mode)
else:
stream = kwargs.pop("stream", None)

4
Lib/test/test_logging.py
View File

@ -3607,6 +3607,10 @@ class BasicConfigTest(unittest.TestCase):
handlers=handlers)
assertRaises(ValueError, logging.basicConfig, stream=stream,
handlers=handlers)
# Issue 23207: test for invalid kwargs
assertRaises(ValueError, logging.basicConfig, loglevel=logging.INFO)
# Should pop both filename and filemode even if filename is None
logging.basicConfig(filename=None, filemode='a')
def test_handlers(self):
handlers = [