Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #27918# test.resource.is_gui_available no longer flashes tk window. 

Also, don't run it if 'gui' is not requested.  Patch by Xiang Zhang.
This commit is contained in:
Terry Jan Reedy 2016-09-05 00:01:34 -04:00
parent 871a3340b7
commit fb5ce7eea1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/support/__init__.py
View File

@ -464,6 +464,7 @@ def _is_gui_available():
try: try:
from tkinter import Tk from tkinter import Tk
root = Tk() root = Tk()
root.withdraw()
root.update() root.update()
root.destroy() root.destroy()
except Exception as e: except Exception as e:
@ -488,12 +489,12 @@ def is_resource_enabled(resource):
def requires(resource, msg=None): def requires(resource, msg=None):
"""Raise ResourceDenied if the specified resource is not available.""" """Raise ResourceDenied if the specified resource is not available."""
if resource == 'gui' and not _is_gui_available():
raise ResourceDenied(_is_gui_available.reason)
if not is_resource_enabled(resource): if not is_resource_enabled(resource):
if msg is None: if msg is None:
msg = "Use of the %r resource not enabled" % resource msg = "Use of the %r resource not enabled" % resource
raise ResourceDenied(msg) raise ResourceDenied(msg)
if resource == 'gui' and not _is_gui_available():
raise ResourceDenied(_is_gui_available.reason)
def _requires_unix_version(sysname, min_version): def _requires_unix_version(sysname, min_version):
"""Decorator raising SkipTest if the OS is `sysname` and the version is less """Decorator raising SkipTest if the OS is `sysname` and the version is less