[Python-checkins] cpython (merge 3.4 -> default): Issue #18604: merge from 3.4

Sun May 4 04:26:00 CEST 2014

http://hg.python.org/cpython/rev/7f6d9990a9b1
changeset: 90557:7f6d9990a9b1
parent: 90555:2c6a231e2c1e
parent: 90556:7ecb6e4b1077
user: Ned Deily <nad at acm.org>
date: Sat May 03 19:25:34 2014 -0700
summary:
 Issue #18604: merge from 3.4
files:
 Lib/test/support/__init__.py | 4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -434,7 +434,9 @@
 reason = "cannot run without OS X gui process"
 
 # check on every platform whether tkinter can actually do anything
- if not reason:
+ # but skip the test on OS X because it can cause segfaults in Cocoa Tk
+ # when running regrtest with the -j option (multiple threads/subprocesses)
+ if (not reason) and (sys.platform != 'darwin'):
 try:
 from tkinter import Tk
 root = Tk()
-- 
Repository URL: http://hg.python.org/cpython
