Issue #22770: merge from 3.4

This commit is contained in:
Ned Deily 2014-11-01 19:33:25 -07:00
commit 048345d417
2 changed files with 4 additions and 3 deletions

View file

@ -461,12 +461,11 @@ class ProcessSerialNumber(Structure):
reason = "cannot run without OS X gui process"
# check on every platform whether tkinter can actually do anything
# 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'):
if not reason:
try:
from tkinter import Tk
root = Tk()
root.update()
root.destroy()
except Exception as e:
err_string = str(e)

View file

@ -1342,6 +1342,8 @@ Tests
- 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
-----------