From b807168a51e49445e08c087dcc5f653b27ad0a43 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Mon, 29 May 2023 22:22:47 -0500 Subject: [PATCH] gh-105077: Fix test_tkinter refleak checking Use specific symbols from `test.support` to avoid having `support` overwritten by `test_tkinter`'s own `support` submodule. --- Lib/test/test_tkinter/__init__.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_tkinter/__init__.py b/Lib/test/test_tkinter/__init__.py index edcb44951bde36..b1181bc04b7953 100644 --- a/Lib/test/test_tkinter/__init__.py +++ b/Lib/test/test_tkinter/__init__.py @@ -1,18 +1,23 @@ import os.path import unittest -from test import support -from test.support import import_helper +from test.support import ( + check_sanitizer, + import_helper, + load_package_tests, + requires, + ) -if support.check_sanitizer(address=True, memory=True): + +if check_sanitizer(address=True, memory=True): raise unittest.SkipTest("Tests involving libX11 can SEGFAULT on ASAN/MSAN builds") # Skip test if _tkinter wasn't built. import_helper.import_module('_tkinter') # Skip test if tk cannot be initialized. -support.requires('gui') +requires('gui') def load_tests(*args): - return support.load_package_tests(os.path.dirname(__file__), *args) + return load_package_tests(os.path.dirname(__file__), *args)