Fixing changes from the last merge.

This commit is contained in:
Guilherme Polo 2009-02-06 23:04:44 +00:00
parent d8f63bbce5
commit b41bc91549
2 changed files with 3 additions and 2 deletions

View file

@ -10,7 +10,7 @@ from _tkinter import TclError
# Restore Tkinter.Tk._loadtk that may have been overridden by ttk. # Restore Tkinter.Tk._loadtk that may have been overridden by ttk.
# If this is not done then this test may fail for reasons related # If this is not done then this test may fail for reasons related
# to ttk only (like failing to load the tile package). # to ttk only (like failing to load the tile package).
from ttk import __loadtk__ from tkinter.ttk import __loadtk__
Tk._loadtk = __loadtk__ Tk._loadtk = __loadtk__

View file

@ -46,7 +46,8 @@ def get_tests_modules(basepath=this_dir_path, gui=True, packages=None):
for name in filenames: for name in filenames:
try: try:
yield importlib.import_module( 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: except test.support.ResourceDenied:
if gui: if gui:
raise raise