Fixing changes from the last merge.
diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 4d92b26..fa20188 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -10,7 +10,7 @@
# 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 3d9775b..e21eca4 100644
--- a/Lib/tkinter/test/runtktests.py
+++ b/Lib/tkinter/test/runtktests.py
@@ -46,7 +46,8 @@
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