From: Ned Deily <nad@acm.org>
Date: Sun, 18 Jan 2015 00:59:50 +0000 (-0800)
Subject: Issue #23211: merge from 3.4
X-Git-Tag: v3.5.0a1~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cad3eb6d5ddb8a1734d2eda6dcddbfca60c057cc;p=python

Issue #23211: merge from 3.4
---

cad3eb6d5ddb8a1734d2eda6dcddbfca60c057cc
diff --cc Misc/NEWS
index c0194d6802,403bf87817..1e36745fc7
--- a/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
  -----------