mirror of
https://github.com/python/cpython
synced 2026-09-29 12:10:30 +03:00
Issue #22770: merge from 3.4
This commit is contained in:
commit
048345d417
2 changed files with 4 additions and 3 deletions
|
|
@ -461,12 +461,11 @@ def _is_gui_available():
|
|||
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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
-----------
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue