From ef2020f63421c896dc9ed58d09f5b402f36789e2 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Mon, 5 Sep 2016 00:01:28 -0400 Subject: [PATCH] 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. --- Lib/test/test_support.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 89c5719df5..2fba2a36d7 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -331,6 +331,7 @@ def _is_gui_available(): try: from Tkinter import Tk root = Tk() + root.withdraw() root.update() root.destroy() except Exception as e: @@ -355,12 +356,12 @@ def is_resource_enabled(resource): def requires(resource, msg=None): """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 msg is None: msg = "Use of the `%s' resource not enabled" % resource raise ResourceDenied(msg) + if resource == 'gui' and not _is_gui_available(): + raise ResourceDenied(_is_gui_available.reason) def requires_mac_ver(*min_version): """Decorator raising SkipTest if the OS is Mac OS X and the OS X -- 2.50.1