summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/logging/__init__.py2
-rw-r--r--Lib/test/test_logging.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 9a8685b..e866b96 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -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)
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 54be217..8770e1b 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3589,6 +3589,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 = [