mirror of https://github.com/python/cpython.git
gh-97527: IDLE: protect macosx Tk() call when no GUI (GH-97530)
Only call tkinter.tk and its follow-up code in _init_tk_type when requires('gui')
does not raise. This function can be called as an unintended side-effect of
calling other idlelib code as part of tests on macOS without a GUI enabled.
(cherry picked from commit 9704f8da33
)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
This commit is contained in:
parent
c2916d2f0e
commit
fe8db634d4
|
@ -4,6 +4,7 @@
|
|||
from os.path import expanduser
|
||||
import plistlib
|
||||
from sys import platform # Used in _init_tk_type, changed by test.
|
||||
from test.support import requires, ResourceDenied
|
||||
|
||||
import tkinter
|
||||
|
||||
|
@ -14,23 +15,26 @@
|
|||
_tk_type = None
|
||||
|
||||
def _init_tk_type():
|
||||
"""
|
||||
Initializes OS X Tk variant values for
|
||||
isAquaTk(), isCarbonTk(), isCocoaTk(), and isXQuartz().
|
||||
""" Initialize _tk_type for isXyzTk functions.
|
||||
"""
|
||||
global _tk_type
|
||||
if platform == 'darwin':
|
||||
root = tkinter.Tk()
|
||||
ws = root.tk.call('tk', 'windowingsystem')
|
||||
if 'x11' in ws:
|
||||
_tk_type = "xquartz"
|
||||
elif 'aqua' not in ws:
|
||||
_tk_type = "other"
|
||||
elif 'AppKit' in root.tk.call('winfo', 'server', '.'):
|
||||
_tk_type = "cocoa"
|
||||
try:
|
||||
requires('gui')
|
||||
except ResourceDenied: # Possible when testing.
|
||||
_tk_type = "cocoa" # Newest and most common.
|
||||
else:
|
||||
_tk_type = "carbon"
|
||||
root.destroy()
|
||||
root = tkinter.Tk()
|
||||
ws = root.tk.call('tk', 'windowingsystem')
|
||||
if 'x11' in ws:
|
||||
_tk_type = "xquartz"
|
||||
elif 'aqua' not in ws:
|
||||
_tk_type = "other"
|
||||
elif 'AppKit' in root.tk.call('winfo', 'server', '.'):
|
||||
_tk_type = "cocoa"
|
||||
else:
|
||||
_tk_type = "carbon"
|
||||
root.destroy()
|
||||
else:
|
||||
_tk_type = "other"
|
||||
|
||||
|
|
Loading…
Reference in New Issue