]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-105077: Fix test_tkinter refleak checking (GH-105078) (GH-105079)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Tue, 30 May 2023 04:25:52 +0000 (21:25 -0700)
committerGitHub <noreply@github.com>
Tue, 30 May 2023 04:25:52 +0000 (23:25 -0500)
Use specific symbols from `test.support` to avoid having `support`
overwritten by `test_tkinter`'s own `support` submodule.
(cherry picked from commit 5454db4ace66018179f034fbffcea8d791d66a98)

Lib/test/test_tkinter/__init__.py

index edcb44951bde36fa5495e383bbaaf1e7c28f3155..b1181bc04b7953a76fb121ba5e5bfcb34dfdf083 100644 (file)
@@ -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)