From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 30 May 2023 04:25:52 +0000 (-0700)
Subject: [3.12] gh-105077: Fix test_tkinter refleak checking (GH-105078) (GH-105079)
X-Git-Tag: v3.12.0b2~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f04a1546f2be67bfa53ddaa5769002d4d1691f2;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-105077: Fix test_tkinter refleak checking (GH-105078) (GH-105079)

Use specific symbols from `test.support` to avoid having `support`
overwritten by `test_tkinter`'s own `support` submodule.
(cherry picked from commit 5454db4ace66018179f034fbffcea8d791d66a98)
---

diff --git a/Lib/test/test_tkinter/__init__.py b/Lib/test/test_tkinter/__init__.py
index edcb44951bde..b1181bc04b79 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)