diff options
Diffstat (limited to 'Lib/test/test_ttk_guionly.py')
-rw-r--r-- | Lib/test/test_ttk_guionly.py | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/Lib/test/test_ttk_guionly.py b/Lib/test/test_ttk_guionly.py index e0368be6a08..b8c1a4ca100 100644 --- a/Lib/test/test_ttk_guionly.py +++ b/Lib/test/test_ttk_guionly.py @@ -1,43 +1,37 @@ import os import unittest -from test import test_support +from test import support # Skip this test if _tkinter wasn't built. -test_support.import_module('_tkinter') - -this_dir = os.path.dirname(os.path.abspath(__file__)) -lib_tk_test = os.path.abspath(os.path.join(this_dir, os.path.pardir, - 'lib-tk', 'test')) - -with test_support.DirsOnSysPath(lib_tk_test): - import runtktests +support.import_module('_tkinter') # Skip test if tk cannot be initialized. -runtktests.check_tk_availability() +from tkinter.test.support import check_tk_availability +check_tk_availability() -import ttk from _tkinter import TclError +from tkinter import ttk +from tkinter.test import runtktests +from tkinter.test.support import get_tk_root try: ttk.Button() -except TclError, msg: +except TclError as msg: # assuming ttk is not available raise unittest.SkipTest("ttk not available: %s" % msg) def test_main(enable_gui=False): if enable_gui: - if test_support.use_resources is None: - test_support.use_resources = ['gui'] - elif 'gui' not in test_support.use_resources: - test_support.use_resources.append('gui') + if support.use_resources is None: + support.use_resources = ['gui'] + elif 'gui' not in support.use_resources: + support.use_resources.append('gui') - with test_support.DirsOnSysPath(lib_tk_test): - from test_ttk.support import get_tk_root - try: - test_support.run_unittest( + try: + support.run_unittest( *runtktests.get_tests(text=False, packages=['test_ttk'])) - finally: - get_tk_root().destroy() + finally: + get_tk_root().destroy() if __name__ == '__main__': test_main(enable_gui=True) |