Issue #23211: merge from 3.4

diff --cc Lib/test/test_logging.py
Simple merge

diff --cc Misc/NEWS
index c0194d6802fb0876c9c2995728e56054ff3f3515,403bf878172d496a5f914dc2018d451977fc44eb..1e36745fc7de12c5fd35614e86d26ca6efa8747d
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1609,8 -1168,6 +1609,10 @@@ Test
  - Issue #21093: Prevent failures of ctypes test_macholib on OS X if a
    copy of libz exists in $HOME/lib or /usr/local/lib.
  
 +- 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
  -----------