diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-05-02 15:51:07 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-05-02 15:51:07 (GMT) |
| commit | ceced6bfead67f81cafad47c950e0769e1ba6db0 (patch) | |
| tree | c0de1b5ada19641b3bb8ce14ba84f8b5777b993a /Lib/test/test_tk.py | |
| parent | 3d5c9e2c6710ad9bd93651494b95c6fb1f81da89 (diff) | |
| download | cpython-ceced6bfead67f81cafad47c950e0769e1ba6db0.zip cpython-ceced6bfead67f81cafad47c950e0769e1ba6db0.tar.gz cpython-ceced6bfead67f81cafad47c950e0769e1ba6db0.tar.bz2 | |
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_tk.py')
| -rw-r--r-- | Lib/test/test_tk.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/test/test_tk.py b/Lib/test/test_tk.py index 7551a7f..589f66d 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 |