From ffa202d011b995210bfe4aa2c3bc8f3f59277552 Mon Sep 17 00:00:00 2001 From: Ido Michael Date: Sun, 15 Mar 2020 10:43:49 -0400 Subject: [PATCH 1/2] Hard reset + Tkinter module only --- Lib/{tkinter/test => }/__init__.py | 0 Lib/test/test_tk.py | 2 +- Lib/test/test_ttk_guionly.py | 2 +- Lib/test/test_ttk_textonly.py | 2 +- Lib/{tkinter/test => test/tkinter_test}/README | 0 .../test/test_tkinter => test/tkinter_test}/__init__.py | 0 Lib/{tkinter/test => test/tkinter_test}/runtktests.py | 2 +- Lib/{tkinter/test => test/tkinter_test}/support.py | 0 .../test_ttk => test/tkinter_test/test_tkinter}/__init__.py | 0 .../test => test/tkinter_test}/test_tkinter/test_font.py | 2 +- .../tkinter_test}/test_tkinter/test_geometry_managers.py | 4 ++-- .../test => test/tkinter_test}/test_tkinter/test_images.py | 2 +- .../test => test/tkinter_test}/test_tkinter/test_loadtk.py | 0 .../test => test/tkinter_test}/test_tkinter/test_misc.py | 2 +- .../test => test/tkinter_test}/test_tkinter/test_text.py | 2 +- .../tkinter_test}/test_tkinter/test_variables.py | 0 .../test => test/tkinter_test}/test_tkinter/test_widgets.py | 4 ++-- Lib/test/tkinter_test/test_ttk/__init__.py | 0 .../test => test/tkinter_test}/test_ttk/test_extensions.py | 2 +- .../test => test/tkinter_test}/test_ttk/test_functions.py | 0 .../test => test/tkinter_test}/test_ttk/test_style.py | 2 +- .../test => test/tkinter_test}/test_ttk/test_widgets.py | 6 +++--- Lib/{tkinter/test => test/tkinter_test}/widget_tests.py | 2 +- Makefile.pre.in | 4 ++-- .../next/Library/2020-03-15-10-32-15.bpo-10572.62_R7j.rst | 1 + 25 files changed, 21 insertions(+), 20 deletions(-) rename Lib/{tkinter/test => }/__init__.py (100%) rename Lib/{tkinter/test => test/tkinter_test}/README (100%) rename Lib/{tkinter/test/test_tkinter => test/tkinter_test}/__init__.py (100%) rename Lib/{tkinter/test => test/tkinter_test}/runtktests.py (97%) rename Lib/{tkinter/test => test/tkinter_test}/support.py (100%) rename Lib/{tkinter/test/test_ttk => test/tkinter_test/test_tkinter}/__init__.py (100%) rename Lib/{tkinter/test => test/tkinter_test}/test_tkinter/test_font.py (98%) rename Lib/{tkinter/test => test/tkinter_test}/test_tkinter/test_geometry_managers.py (99%) rename Lib/{tkinter/test => test/tkinter_test}/test_tkinter/test_images.py (99%) rename Lib/{tkinter/test => test/tkinter_test}/test_tkinter/test_loadtk.py (100%) rename Lib/{tkinter/test => test/tkinter_test}/test_tkinter/test_misc.py (99%) rename Lib/{tkinter/test => test/tkinter_test}/test_tkinter/test_text.py (96%) rename Lib/{tkinter/test => test/tkinter_test}/test_tkinter/test_variables.py (100%) rename Lib/{tkinter/test => test/tkinter_test}/test_tkinter/test_widgets.py (99%) create mode 100644 Lib/test/tkinter_test/test_ttk/__init__.py rename Lib/{tkinter/test => test/tkinter_test}/test_ttk/test_extensions.py (99%) rename Lib/{tkinter/test => test/tkinter_test}/test_ttk/test_functions.py (100%) rename Lib/{tkinter/test => test/tkinter_test}/test_ttk/test_style.py (98%) rename Lib/{tkinter/test => test/tkinter_test}/test_ttk/test_widgets.py (99%) rename Lib/{tkinter/test => test/tkinter_test}/widget_tests.py (99%) create mode 100644 Misc/NEWS.d/next/Library/2020-03-15-10-32-15.bpo-10572.62_R7j.rst 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..e77ae8f28b4ec8 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 Lib.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..03b3811f19c43a 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 Lib.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..ac9c630f64b698 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 Lib.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..5058fb1104a29c 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") + "Lib.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..6ce622f2efa078 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 Lib.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..e5a08d0e8e6206 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 Lib.test.tkinter_test.support import pixels_conv, tcl_version, requires_tcl +from Lib.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..1c77aae9b7bf9a 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 Lib.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..a7c5cbd7e9b7e9 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 Lib.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..ae6a071ed0b1bf 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 Lib.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..263a076b2e8fbc 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 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) 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..d8bf66cecaf023 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 Lib.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..46c6991dff971c 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 Lib.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..03947e917d430b 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 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) 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..9c83045d23e3fc 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 Lib.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..57bdcfe7d94687 --- /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 `Lib/test/MODULE_NAME_test` From 844ce313b1ae8e3c5e1990356632154f15e580be Mon Sep 17 00:00:00 2001 From: Ido Michael Date: Mon, 16 Mar 2020 08:26:41 -0400 Subject: [PATCH 2/2] Fixing import to point to test --- Lib/test/test_tk.py | 2 +- Lib/test/test_ttk_guionly.py | 2 +- Lib/test/test_ttk_textonly.py | 2 +- Lib/test/tkinter_test/runtktests.py | 2 +- Lib/test/tkinter_test/test_tkinter/test_font.py | 2 +- .../tkinter_test/test_tkinter/test_geometry_managers.py | 4 ++-- Lib/test/tkinter_test/test_tkinter/test_images.py | 2 +- Lib/test/tkinter_test/test_tkinter/test_misc.py | 2 +- Lib/test/tkinter_test/test_tkinter/test_text.py | 2 +- Lib/test/tkinter_test/test_tkinter/test_widgets.py | 4 ++-- Lib/test/tkinter_test/test_ttk/test_extensions.py | 2 +- Lib/test/tkinter_test/test_ttk/test_style.py | 2 +- Lib/test/tkinter_test/test_ttk/test_widgets.py | 6 +++--- Lib/test/tkinter_test/widget_tests.py | 2 +- .../next/Library/2020-03-15-10-32-15.bpo-10572.62_R7j.rst | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Lib/test/test_tk.py b/Lib/test/test_tk.py index e77ae8f28b4ec8..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 Lib.test.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 03b3811f19c43a..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 Lib.test.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 ac9c630f64b698..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 Lib.test.tkinter_test import runtktests +from test.tkinter_test import runtktests def test_main(): support.run_unittest( diff --git a/Lib/test/tkinter_test/runtktests.py b/Lib/test/tkinter_test/runtktests.py index 5058fb1104a29c..f21831c8de0a5d 100644 --- a/Lib/test/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)]), - "Lib.test.tkinter_test") + "test.tkinter_test") except test.support.ResourceDenied: if gui: raise diff --git a/Lib/test/tkinter_test/test_tkinter/test_font.py b/Lib/test/tkinter_test/test_tkinter/test_font.py index 6ce622f2efa078..5716526773fc83 100644 --- a/Lib/test/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 Lib.test.tkinter_test.support import AbstractTkTest +from test.tkinter_test.support import AbstractTkTest requires('gui') diff --git a/Lib/test/tkinter_test/test_tkinter/test_geometry_managers.py b/Lib/test/tkinter_test/test_tkinter/test_geometry_managers.py index e5a08d0e8e6206..f510b32c79b874 100644 --- a/Lib/test/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 Lib.test.tkinter_test.support import pixels_conv, tcl_version, requires_tcl -from Lib.test.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/test/tkinter_test/test_tkinter/test_images.py b/Lib/test/tkinter_test/test_tkinter/test_images.py index 1c77aae9b7bf9a..f9b696c32494eb 100644 --- a/Lib/test/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 Lib.test.tkinter_test.support import AbstractTkTest, requires_tcl +from test.tkinter_test.support import AbstractTkTest, requires_tcl support.requires('gui') diff --git a/Lib/test/tkinter_test/test_tkinter/test_misc.py b/Lib/test/tkinter_test/test_tkinter/test_misc.py index a7c5cbd7e9b7e9..8d6a6c4cb32632 100644 --- a/Lib/test/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 Lib.test.tkinter_test.support import AbstractTkTest +from test.tkinter_test.support import AbstractTkTest support.requires('gui') diff --git a/Lib/test/tkinter_test/test_tkinter/test_text.py b/Lib/test/tkinter_test/test_tkinter/test_text.py index ae6a071ed0b1bf..97090632dbe46e 100644 --- a/Lib/test/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 Lib.test.tkinter_test.support import AbstractTkTest +from test.tkinter_test.support import AbstractTkTest requires('gui') diff --git a/Lib/test/tkinter_test/test_tkinter/test_widgets.py b/Lib/test/tkinter_test/test_tkinter/test_widgets.py index 263a076b2e8fbc..266d2277b1f8a5 100644 --- a/Lib/test/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 Lib.test.tkinter_test.support import (tcl_version, requires_tcl, +from test.tkinter_test.support import (tcl_version, requires_tcl, get_tk_patchlevel, widget_eq) -from Lib.test.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/test_extensions.py b/Lib/test/tkinter_test/test_ttk/test_extensions.py index d8bf66cecaf023..f95eedee21063e 100644 --- a/Lib/test/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 Lib.test.tkinter_test.support import AbstractTkTest, destroy_default_root +from test.tkinter_test.support import AbstractTkTest, destroy_default_root requires('gui') diff --git a/Lib/test/tkinter_test/test_ttk/test_style.py b/Lib/test/tkinter_test/test_ttk/test_style.py index 46c6991dff971c..7f1056d5f2580d 100644 --- a/Lib/test/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 Lib.test.tkinter_test.support import AbstractTkTest +from test.tkinter_test.support import AbstractTkTest requires('gui') diff --git a/Lib/test/tkinter_test/test_ttk/test_widgets.py b/Lib/test/tkinter_test/test_ttk/test_widgets.py index 03947e917d430b..74bf5bfffd8be4 100644 --- a/Lib/test/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 Lib.test.tkinter_test.test_ttk.test_functions import MockTclObj -from Lib.test.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 Lib.test.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/test/tkinter_test/widget_tests.py b/Lib/test/tkinter_test/widget_tests.py index 9c83045d23e3fc..8949abaa2f4695 100644 --- a/Lib/test/tkinter_test/widget_tests.py +++ b/Lib/test/tkinter_test/widget_tests.py @@ -3,7 +3,7 @@ import unittest import sys import tkinter -from Lib.test.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/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 index 57bdcfe7d94687..9536a778ac67c4 100644 --- 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 @@ -1 +1 @@ -Moved these class tests: `tkinter.test` to be under `Lib/test/MODULE_NAME_test` +Moved these class tests: `tkinter.test` to be under `test/tkinter_test` pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy