summaryrefslogtreecommitdiff
path: root/Lib/test/test_ttk_guionly.py
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-05-02 10:51:07 -0500
committerZachary Ware <zachary.ware@gmail.com>2014-05-02 10:51:07 -0500
commit6282e7e1d534afeb82e09ab62cfb3b3cd62f906f (patch)
tree50607540515b625073ec4beaebddd0d5b1741c6d /Lib/test/test_ttk_guionly.py
parent3a26cd3c0d09734f878c7a1c4b4961ed04b15774 (diff)
downloadcpython-6282e7e1d534afeb82e09ab62cfb3b3cd62f906f.tar.gz
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).
Diffstat (limited to 'Lib/test/test_ttk_guionly.py')
-rw-r--r--Lib/test/test_ttk_guionly.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/test/test_ttk_guionly.py b/Lib/test/test_ttk_guionly.py
index 3a3459bdd2..502b06765e 100644
--- a/Lib/test/test_ttk_guionly.py
+++ b/Lib/test/test_ttk_guionly.py
@@ -9,8 +9,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 import TclError
from tkinter import ttk