Hard reset + Tkinter module only

Lib/test/test_tk.py

@@ -5,7 +5,7 @@
 # Skip test if tk cannot be initialized.
 support.requires('gui')
 
-from tkinter.test import runtktests
+from Lib.test.tkinter_test import runtktests
 
 def test_main():
     support.run_unittest(

Lib/test/test_ttk_guionly.py

@@ -10,7 +10,7 @@
 import tkinter
 from _tkinter import TclError
 from tkinter import ttk
-from tkinter.test import runtktests
+from Lib.test.tkinter_test import runtktests
 
 root = None
 try:

Lib/test/test_ttk_textonly.py

@@ -3,7 +3,7 @@
 # Skip this test if _tkinter does not exist.
 support.import_module('_tkinter')
 
-from tkinter.test import runtktests
+from Lib.test.tkinter_test import runtktests
 
 def test_main():
     support.run_unittest(

Lib/tkinter/test/runtktests.py → Lib/test/tkinter_test/runtktests.py

@@ -45,7 +45,7 @@ def get_tests_modules(basepath=this_dir_path, gui=True, packages=None):
                 try:
                     yield importlib.import_module(
                         ".%s.%s" % (pkg_name, name[:-len(py_ext)]),
-                        "tkinter.test")
+                        "Lib.test.tkinter_test")
                 except test.support.ResourceDenied:
                     if gui:
                         raise

Lib/tkinter/test/test_tkinter/test_font.py → Lib/test/tkinter_test/test_tkinter/test_font.py

@@ -2,7 +2,7 @@
 import tkinter
 from tkinter import font
 from test.support import requires, run_unittest, gc_collect, ALWAYS_EQ
-from tkinter.test.support import AbstractTkTest
+from Lib.test.tkinter_test.support import AbstractTkTest
 
 requires('gui')
 

Lib/tkinter/test/test_tkinter/test_geometry_managers.py → Lib/test/tkinter_test/test_tkinter/test_geometry_managers.py

@@ -4,8 +4,8 @@
 from tkinter import TclError
 from test.support import requires
 
-from tkinter.test.support import pixels_conv, tcl_version, requires_tcl
-from tkinter.test.widget_tests import AbstractWidgetTest
+from Lib.test.tkinter_test.support import pixels_conv, tcl_version, requires_tcl
+from Lib.test.tkinter_test.widget_tests import AbstractWidgetTest
 
 requires('gui')
 

Lib/tkinter/test/test_tkinter/test_images.py → Lib/test/tkinter_test/test_tkinter/test_images.py

@@ -1,7 +1,7 @@
 import unittest
 import tkinter
 from test import support
-from tkinter.test.support import AbstractTkTest, requires_tcl
+from Lib.test.tkinter_test.support import AbstractTkTest, requires_tcl
 
 support.requires('gui')
 

Lib/tkinter/test/test_tkinter/test_misc.py → Lib/test/tkinter_test/test_tkinter/test_misc.py

@@ -1,7 +1,7 @@
 import unittest
 import tkinter
 from test import support
-from tkinter.test.support import AbstractTkTest
+from Lib.test.tkinter_test.support import AbstractTkTest
 
 support.requires('gui')
 

Lib/tkinter/test/test_tkinter/test_text.py → Lib/test/tkinter_test/test_tkinter/test_text.py

@@ -1,7 +1,7 @@
 import unittest
 import tkinter
 from test.support import requires, run_unittest
-from tkinter.test.support import AbstractTkTest
+from Lib.test.tkinter_test.support import AbstractTkTest
 
 requires('gui')
 

Lib/tkinter/test/test_tkinter/test_widgets.py → Lib/test/tkinter_test/test_tkinter/test_widgets.py

@@ -5,9 +5,9 @@
 import sys
 from test.support import requires
 
-from tkinter.test.support import (tcl_version, requires_tcl,
+from Lib.test.tkinter_test.support import (tcl_version, requires_tcl,
                                   get_tk_patchlevel, widget_eq)
-from tkinter.test.widget_tests import (
+from Lib.test.tkinter_test.widget_tests import (
     add_standard_options, noconv, pixels_round,
     AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests,
     setUpModule)

Lib/tkinter/test/test_ttk/test_extensions.py → Lib/test/tkinter_test/test_ttk/test_extensions.py

@@ -3,7 +3,7 @@
 import tkinter
 from tkinter import ttk
 from test.support import requires, run_unittest, swap_attr
-from tkinter.test.support import AbstractTkTest, destroy_default_root
+from Lib.test.tkinter_test.support import AbstractTkTest, destroy_default_root
 
 requires('gui')
 

Lib/tkinter/test/test_ttk/test_style.py → Lib/test/tkinter_test/test_ttk/test_style.py

@@ -2,7 +2,7 @@
 import tkinter
 from tkinter import ttk
 from test.support import requires, run_unittest
-from tkinter.test.support import AbstractTkTest
+from Lib.test.tkinter_test.support import AbstractTkTest
 
 requires('gui')
 

Lib/tkinter/test/test_ttk/test_widgets.py → Lib/test/tkinter_test/test_ttk/test_widgets.py

@@ -4,10 +4,10 @@
 from test.support import requires
 import sys
 
-from tkinter.test.test_ttk.test_functions import MockTclObj
-from tkinter.test.support import (AbstractTkTest, tcl_version, get_tk_patchlevel,
+from Lib.test.tkinter_test.test_ttk.test_functions import MockTclObj
+from Lib.test.tkinter_test.support import (AbstractTkTest, tcl_version, get_tk_patchlevel,
                                   simulate_mouse_click)
-from tkinter.test.widget_tests import (add_standard_options, noconv,
+from Lib.test.tkinter_test.widget_tests import (add_standard_options, noconv,
     AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests,
     setUpModule)
 

Lib/tkinter/test/widget_tests.py → Lib/test/tkinter_test/widget_tests.py

@@ -3,7 +3,7 @@
 import unittest
 import sys
 import tkinter
-from tkinter.test.support import (AbstractTkTest, tcl_version, requires_tcl,
+from Lib.test.tkinter_test.support import (AbstractTkTest, tcl_version, requires_tcl,
                                   get_tk_patchlevel, pixels_conv, tcl_obj_eq)
 import test.support
 

Makefile.pre.in

@@ -1325,8 +1325,8 @@ maninstall:	altmaninstall
 
 # Install the library
 XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
-LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
-		tkinter/test/test_ttk site-packages test \
+LIBSUBDIRS=	tkinter test/tkinter_test test/tkinter_test/test_tkinter \
+		test/tkinter_test/test_ttk site-packages test \
 		test/audiodata \
 		test/capath test/data \
 		test/cjkencodings test/decimaltestdata \

Misc/NEWS.d/next/Library/2020-03-15-10-32-15.bpo-10572.62_R7j.rst

@@ -0,0 +1 @@
+Moved these class tests: `tkinter.test` to be under `Lib/test/MODULE_NAME_test`