[Python-checkins] r69379 - in python/branches/py3k/Lib: test/test_tcl.py tkinter/test/runtktests.py

Sat Feb 7 00:04:49 CET 2009

Author: guilherme.polo
Date: Sat Feb 7 00:04:44 2009
New Revision: 69379
Log:
Fixing changes from the last merge.
Modified:
 python/branches/py3k/Lib/test/test_tcl.py
 python/branches/py3k/Lib/tkinter/test/runtktests.py
Modified: python/branches/py3k/Lib/test/test_tcl.py
==============================================================================

--- python/branches/py3k/Lib/test/test_tcl.py	(original)
+++ python/branches/py3k/Lib/test/test_tcl.py	Sat Feb 7 00:04:44 2009
@@ -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__
 
 
Modified: python/branches/py3k/Lib/tkinter/test/runtktests.py
==============================================================================
--- python/branches/py3k/Lib/tkinter/test/runtktests.py	(original)
+++ python/branches/py3k/Lib/tkinter/test/runtktests.py	Sat Feb 7 00:04:44 2009
@@ -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
