Fixing changes from the last merge.

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__
 
 

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