From: Ned Deily <nad@acm.org>
Date: Sun, 2 Nov 2014 02:33:25 +0000 (-0700)
Subject: Issue #22770: merge from 3.4
X-Git-Tag: v3.5.0a1~540
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=048345d4174254a1d70eb4aa09109dddee858223;p=thirdparty%2FPython%2Fcpython.git

Issue #22770: merge from 3.4
---

048345d4174254a1d70eb4aa09109dddee858223
diff --cc Misc/NEWS
index c47b3ff50a9c,c52aa62efddb..3f62b97e2f77
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1342,6 -962,6 +1342,8 @@@ 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.
++
  Tools/Demos
  -----------