summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGuilherme Polo <ggpolo@gmail.com>2009-02-06 23:04:44 (GMT)
committerGuilherme Polo <ggpolo@gmail.com>2009-02-06 23:04:44 (GMT)
commitb41bc91549fdcdb2d206271edd0cccabe56664f8 (patch)
treead597480f1e6823c7b7c3652da0117e95e10a632 /Lib
parentd8f63bbce50c702086cc93ea2131c268752d45b3 (diff)
downloadcpython-b41bc91549fdcdb2d206271edd0cccabe56664f8.zip
cpython-b41bc91549fdcdb2d206271edd0cccabe56664f8.tar.gz
cpython-b41bc91549fdcdb2d206271edd0cccabe56664f8.tar.bz2
Fixing changes from the last merge.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_tcl.py2
-rw-r--r--Lib/tkinter/test/runtktests.py3
2 files changed, 3 insertions, 2 deletions
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 @@ 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 3d9775b..e21eca4 100644
--- 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