#Issue 11424: merged fix from 2.6.

diff --cc Lib/logging/config.py
Simple merge

diff --cc Lib/test/test_logging.py
index 9f8374ab07d66bf864f07b47cf2409a4cf989800,fbbef64cd32608f2b4b6b6acf1168370a0daedcd..4e19bcc204024d0f80f42e59c0540b9422c28559
--- 1/Lib/test/test_logging.py
--- 2/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@@ -640,9 -668,53 +672,47 @@@ class ConfigFileTest(BaseTest)
      datefmt=
      """
  
+     # config7 adds a compiler logger.
+     config7 = """
+     [loggers]
+     keys=root,parser,compiler
+ 
+     [handlers]
+     keys=hand1
+ 
+     [formatters]
+     keys=form1
+ 
+     [logger_root]
+     level=WARNING
+     handlers=hand1
+ 
+     [logger_compiler]
+     level=DEBUG
+     handlers=
+     propagate=1
+     qualname=compiler
+ 
+     [logger_parser]
+     level=DEBUG
+     handlers=
+     propagate=1
+     qualname=compiler.parser
+ 
+     [handler_hand1]
+     class=StreamHandler
+     level=NOTSET
+     formatter=form1
+     args=(sys.stdout,)
+ 
+     [formatter_form1]
+     format=%(levelname)s ++ %(message)s
+     datefmt=
+     """
+ 
      def apply_config(self, conf):
 -        try:
 -            fn = tempfile.mktemp(".ini")
 -            f = open(fn, "w")
 -            f.write(textwrap.dedent(conf))
 -            f.close()
 -            logging.config.fileConfig(fn)
 -        finally:
 -            os.remove(fn)
 +        file = cStringIO.StringIO(textwrap.dedent(conf))
 +        logging.config.fileConfig(file)
  
      def test_config0_ok(self):
          # A simple config file which overrides the default settings.