Fixing changes from the last merge.

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 4d92b268b8e631686a6b609a87181df03011b9af..fa20188b5f9f506a7f0736ec022c1c0a6e711d8e 100644 (file)
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -10,7 +10,7 @@ from _tkinter import TclError
 # Restore Tkinter.Tk._loadtk that may have been overridden by ttk.
 # If this is not done then this test may fail for reasons related
 # to ttk only (like failing to load the tile package).
-from ttk import __loadtk__
+from tkinter.ttk import __loadtk__
 Tk._loadtk = __loadtk__
 
 

diff --git a/Lib/tkinter/test/runtktests.py b/Lib/tkinter/test/runtktests.py
index 3d9775b58f87faac9d16edf1f79120eb508afa8f..e21eca4c45e066ff9078921d436fbb3b5d9cac7f 100644 (file)
--- a/Lib/tkinter/test/runtktests.py
+++ b/Lib/tkinter/test/runtktests.py
@@ -46,7 +46,8 @@ def get_tests_modules(basepath=this_dir_path, gui=True, packages=None):
             for name in filenames:
                 try:
                     yield importlib.import_module(
-                        ".%s" % name[:-len(py_ext)], pkg_name)
+                        ".%s.%s" % (pkg_name, name[:-len(py_ext)]),
+                        "tkinter.test")
                 except test.support.ResourceDenied:
                     if gui:
                         raise