Issue #17521: Merged fix from 3.2.

3 files changed, 37 insertions, 4 deletions

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 0cce710..11e79a2 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -172,8 +172,8 @@ def _handle_existing_loggers(existing, child_loggers, disable_existing):
             logger.level = logging.NOTSET
             logger.handlers = []
             logger.propagate = True
-        elif disable_existing:
-            logger.disabled = True
+        else:
+            logger.disabled = disable_existing
 
 def _install_loggers(cp, handlers, disable_existing):
     """Create and install loggers"""
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 69da27a..2ff8c91 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1257,9 +1257,30 @@ class ConfigFileTest(BaseTest):
     datefmt=
     """
 
-    def apply_config(self, conf):
+    disable_test = """
+    [loggers]
+    keys=root
+
+    [handlers]
+    keys=screen
+
+    [formatters]
+    keys=
+
+    [logger_root]
+    level=DEBUG
+    handlers=screen
+
+    [handler_screen]
+    level=DEBUG
+    class=StreamHandler
+    args=(sys.stdout,)
+    formatter=
+    """
+
+    def apply_config(self, conf, **kwargs):
         file = io.StringIO(textwrap.dedent(conf))
-        logging.config.fileConfig(file)
+        logging.config.fileConfig(file, **kwargs)
 
     def test_config0_ok(self):
         # A simple config file which overrides the default settings.
@@ -1363,6 +1384,15 @@ class ConfigFileTest(BaseTest):
             # Original logger output is empty.
             self.assert_log_lines([])
 
+    def test_logger_disabling(self):
+        self.apply_config(self.disable_test)
+        logger = logging.getLogger('foo')
+        self.assertFalse(logger.disabled)
+        self.apply_config(self.disable_test)
+        self.assertTrue(logger.disabled)
+        self.apply_config(self.disable_test, disable_existing_loggers=False)
+        self.assertFalse(logger.disabled)
+
 
 @unittest.skipUnless(threading, 'Threading required for this test.')
 class SocketHandlerTest(BaseTest):
diff --git a/Misc/NEWS b/Misc/NEWS
index 44bf93b..0a94579 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -196,6 +196,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #17521: Corrected non-enabling of logger following two calls to
+  fileConfig().
+
 - Issue #17508: Corrected MemoryHandler configuration in dictConfig() where
   the target handler wasn't configured first.