From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 18 Mar 2015 08:47:58 +0000 (+0000)
Subject: Issue #23207: Improved kwarg validation.
X-Git-Tag: v3.5.0a3~155^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d55436ace3cb908e0f7a1f368a2cd8879175947d;p=python

Issue #23207: Improved kwarg validation.
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 9a8685b3d4..e866b9623e 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 54be2176a8..8770e1b76c 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 = [