Issue #23211: merge from 3.4

Lib/test/test_logging.py

@@ -926,10 +926,10 @@ class SMTPHandlerTest(BaseTest):
     TIMEOUT = 8.0
     def test_basic(self):
         sockmap = {}
-        server = TestSMTPServer(('localhost', 0), self.process_message, 0.001,
+        server = TestSMTPServer((support.HOST, 0), self.process_message, 0.001,
                                 sockmap)
         server.start()
-        addr = ('localhost', server.port)
+        addr = (support.HOST, server.port)
         h = logging.handlers.SMTPHandler(addr, 'me', 'you', 'Log',
                                          timeout=self.TIMEOUT)
         self.assertEqual(h.toaddrs, ['you'])

Misc/NEWS

@@ -1611,6 +1611,8 @@ Tests
 
 - Issue #22770: Prevent some Tk segfaults on OS X when running gui tests.
 
+- Issue #23211: Workaround test_logging failure on some OS X 10.6 systems.
+
 Tools/Demos
 -----------