diff --git a/Lib/tkinter/test/__init__.py b/Lib/__init__.py similarity index 100% rename from Lib/tkinter/test/__init__.py rename to Lib/__init__.py diff --git a/Lib/test/test_tk.py b/Lib/test/test_tk.py index 48cefd92e12162..3b3f6e53f34062 100644 --- a/Lib/test/test_tk.py +++ b/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 test.tkinter_test import runtktests def test_main(): support.run_unittest( diff --git a/Lib/test/test_ttk_guionly.py b/Lib/test/test_ttk_guionly.py index 462665db5f3e75..1602ab10f2a88b 100644 --- a/Lib/test/test_ttk_guionly.py +++ b/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 test.tkinter_test import runtktests root = None try: diff --git a/Lib/test/test_ttk_textonly.py b/Lib/test/test_ttk_textonly.py index 7540a4310344c1..9ad3f5303d35b9 100644 --- a/Lib/test/test_ttk_textonly.py +++ b/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 test.tkinter_test import runtktests def test_main(): support.run_unittest( diff --git a/Lib/tkinter/test/README b/Lib/test/tkinter_test/README similarity index 100% rename from Lib/tkinter/test/README rename to Lib/test/tkinter_test/README diff --git a/Lib/tkinter/test/test_tkinter/__init__.py b/Lib/test/tkinter_test/__init__.py similarity index 100% rename from Lib/tkinter/test/test_tkinter/__init__.py rename to Lib/test/tkinter_test/__init__.py diff --git a/Lib/tkinter/test/runtktests.py b/Lib/test/tkinter_test/runtktests.py similarity index 97% rename from Lib/tkinter/test/runtktests.py rename to Lib/test/tkinter_test/runtktests.py index 33dc54a1375bf8..f21831c8de0a5d 100644 --- a/Lib/tkinter/test/runtktests.py +++ b/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") + "test.tkinter_test") except test.support.ResourceDenied: if gui: raise diff --git a/Lib/tkinter/test/support.py b/Lib/test/tkinter_test/support.py similarity index 100% rename from Lib/tkinter/test/support.py rename to Lib/test/tkinter_test/support.py diff --git a/Lib/tkinter/test/test_ttk/__init__.py b/Lib/test/tkinter_test/test_tkinter/__init__.py similarity index 100% rename from Lib/tkinter/test/test_ttk/__init__.py rename to Lib/test/tkinter_test/test_tkinter/__init__.py diff --git a/Lib/tkinter/test/test_tkinter/test_font.py b/Lib/test/tkinter_test/test_tkinter/test_font.py similarity index 98% rename from Lib/tkinter/test/test_tkinter/test_font.py rename to Lib/test/tkinter_test/test_tkinter/test_font.py index a021ea336807bb..5716526773fc83 100644 --- a/Lib/tkinter/test/test_tkinter/test_font.py +++ b/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 test.tkinter_test.support import AbstractTkTest requires('gui') diff --git a/Lib/tkinter/test/test_tkinter/test_geometry_managers.py b/Lib/test/tkinter_test/test_tkinter/test_geometry_managers.py similarity index 99% rename from Lib/tkinter/test/test_tkinter/test_geometry_managers.py rename to Lib/test/tkinter_test/test_tkinter/test_geometry_managers.py index c645d430079a52..f510b32c79b874 100644 --- a/Lib/tkinter/test/test_tkinter/test_geometry_managers.py +++ b/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 test.tkinter_test.support import pixels_conv, tcl_version, requires_tcl +from test.tkinter_test.widget_tests import AbstractWidgetTest requires('gui') diff --git a/Lib/tkinter/test/test_tkinter/test_images.py b/Lib/test/tkinter_test/test_tkinter/test_images.py similarity index 99% rename from Lib/tkinter/test/test_tkinter/test_images.py rename to Lib/test/tkinter_test/test_tkinter/test_images.py index 2805d35a1f5b1b..f9b696c32494eb 100644 --- a/Lib/tkinter/test/test_tkinter/test_images.py +++ b/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 test.tkinter_test.support import AbstractTkTest, requires_tcl support.requires('gui') diff --git a/Lib/tkinter/test/test_tkinter/test_loadtk.py b/Lib/test/tkinter_test/test_tkinter/test_loadtk.py similarity index 100% rename from Lib/tkinter/test/test_tkinter/test_loadtk.py rename to Lib/test/tkinter_test/test_tkinter/test_loadtk.py diff --git a/Lib/tkinter/test/test_tkinter/test_misc.py b/Lib/test/tkinter_test/test_tkinter/test_misc.py similarity index 99% rename from Lib/tkinter/test/test_tkinter/test_misc.py rename to Lib/test/tkinter_test/test_tkinter/test_misc.py index 1e089747a91ee5..8d6a6c4cb32632 100644 --- a/Lib/tkinter/test/test_tkinter/test_misc.py +++ b/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 test.tkinter_test.support import AbstractTkTest support.requires('gui') diff --git a/Lib/tkinter/test/test_tkinter/test_text.py b/Lib/test/tkinter_test/test_tkinter/test_text.py similarity index 96% rename from Lib/tkinter/test/test_tkinter/test_text.py rename to Lib/test/tkinter_test/test_tkinter/test_text.py index 13b7c56a3978d9..97090632dbe46e 100644 --- a/Lib/tkinter/test/test_tkinter/test_text.py +++ b/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 test.tkinter_test.support import AbstractTkTest requires('gui') diff --git a/Lib/tkinter/test/test_tkinter/test_variables.py b/Lib/test/tkinter_test/test_tkinter/test_variables.py similarity index 100% rename from Lib/tkinter/test/test_tkinter/test_variables.py rename to Lib/test/tkinter_test/test_tkinter/test_variables.py diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/test/tkinter_test/test_tkinter/test_widgets.py similarity index 99% rename from Lib/tkinter/test/test_tkinter/test_widgets.py rename to Lib/test/tkinter_test/test_tkinter/test_widgets.py index 16e9d93944c205..266d2277b1f8a5 100644 --- a/Lib/tkinter/test/test_tkinter/test_widgets.py +++ b/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 test.tkinter_test.support import (tcl_version, requires_tcl, get_tk_patchlevel, widget_eq) -from tkinter.test.widget_tests import ( +from test.tkinter_test.widget_tests import ( add_standard_options, noconv, pixels_round, AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests, setUpModule) diff --git a/Lib/test/tkinter_test/test_ttk/__init__.py b/Lib/test/tkinter_test/test_ttk/__init__.py new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/Lib/tkinter/test/test_ttk/test_extensions.py b/Lib/test/tkinter_test/test_ttk/test_extensions.py similarity index 99% rename from Lib/tkinter/test/test_ttk/test_extensions.py rename to Lib/test/tkinter_test/test_ttk/test_extensions.py index a45f882bb00d48..f95eedee21063e 100644 --- a/Lib/tkinter/test/test_ttk/test_extensions.py +++ b/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 test.tkinter_test.support import AbstractTkTest, destroy_default_root requires('gui') diff --git a/Lib/tkinter/test/test_ttk/test_functions.py b/Lib/test/tkinter_test/test_ttk/test_functions.py similarity index 100% rename from Lib/tkinter/test/test_ttk/test_functions.py rename to Lib/test/tkinter_test/test_ttk/test_functions.py diff --git a/Lib/tkinter/test/test_ttk/test_style.py b/Lib/test/tkinter_test/test_ttk/test_style.py similarity index 98% rename from Lib/tkinter/test/test_ttk/test_style.py rename to Lib/test/tkinter_test/test_ttk/test_style.py index 3537536d81bc56..7f1056d5f2580d 100644 --- a/Lib/tkinter/test/test_ttk/test_style.py +++ b/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 test.tkinter_test.support import AbstractTkTest requires('gui') diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/test/tkinter_test/test_ttk/test_widgets.py similarity index 99% rename from Lib/tkinter/test/test_ttk/test_widgets.py rename to Lib/test/tkinter_test/test_ttk/test_widgets.py index 2598bc67652075..74bf5bfffd8be4 100644 --- a/Lib/tkinter/test/test_ttk/test_widgets.py +++ b/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 test.tkinter_test.test_ttk.test_functions import MockTclObj +from 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 test.tkinter_test.widget_tests import (add_standard_options, noconv, AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests, setUpModule) diff --git a/Lib/tkinter/test/widget_tests.py b/Lib/test/tkinter_test/widget_tests.py similarity index 99% rename from Lib/tkinter/test/widget_tests.py rename to Lib/test/tkinter_test/widget_tests.py index b42ff52178f29e..8949abaa2f4695 100644 --- a/Lib/tkinter/test/widget_tests.py +++ b/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 test.tkinter_test.support import (AbstractTkTest, tcl_version, requires_tcl, get_tk_patchlevel, pixels_conv, tcl_obj_eq) import test.support diff --git a/Makefile.pre.in b/Makefile.pre.in index caa1d376485343..bd0f09534c6efc 100644 --- a/Makefile.pre.in +++ b/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 \ diff --git a/Misc/NEWS.d/next/Library/2020-03-15-10-32-15.bpo-10572.62_R7j.rst b/Misc/NEWS.d/next/Library/2020-03-15-10-32-15.bpo-10572.62_R7j.rst new file mode 100644 index 00000000000000..9536a778ac67c4 --- /dev/null +++ b/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 `test/tkinter_test`