From ceced6bfead67f81cafad47c950e0769e1ba6db0 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Fri, 2 May 2014 10:51:07 -0500 Subject: Issue #18604: Consolidated checks for GUI availability. test_support._is_gui_available is now defined the same way on every platform, and now includes the Windows-specific check that had been in the Windows version of _is_gui_available and the OSX-specific check that was in tkinter.test.support.check_tk_availability. Also, every platform checks whether Tk can be instantiated (if the platform-specific checks passed). --- Lib/test/test_tk.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Lib/test/test_tk.py') diff --git a/Lib/test/test_tk.py b/Lib/test/test_tk.py index 7551a7f470..589f66d692 100644 --- a/Lib/test/test_tk.py +++ b/Lib/test/test_tk.py @@ -6,8 +6,7 @@ support.import_module('_tkinter') support.import_fresh_module('tkinter') # Skip test if tk cannot be initialized. -from tkinter.test.support import check_tk_availability -check_tk_availability() +support.requires('gui') from tkinter.test import runtktests -- cgit v1.2.1