Merged revisions 69141,69211-69212 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69141 | benjamin.peterson | 2009-01-31 14:01:48 -0600 (Sat, 31 Jan 2009) | 1 line

  fix indentation
........
  r69211 | guilherme.polo | 2009-02-02 14:23:29 -0600 (Mon, 02 Feb 2009) | 1 line

  Restore the previous geometry before leaving the test
........
  r69212 | guilherme.polo | 2009-02-02 14:28:59 -0600 (Mon, 02 Feb 2009) | 1 line

  Moving to importlib
........
diff --git a/Lib/tkinter/test/runtktests.py b/Lib/tkinter/test/runtktests.py
index 7067594..3d9775b 100644
--- a/Lib/tkinter/test/runtktests.py
+++ b/Lib/tkinter/test/runtktests.py
@@ -9,6 +9,7 @@
 import os
 import sys
 import unittest
+import importlib
 import test.support
 
 this_dir_path = os.path.abspath(os.path.dirname(__file__))
@@ -44,13 +45,8 @@
 
             for name in filenames:
                 try:
-                    yield __import__(
-                            "%s.%s.%s" % (
-                                "tkinter.test",
-                                pkg_name,
-                                name[:-len(py_ext)]),
-                            fromlist=['']
-                            )
+                    yield importlib.import_module(
+                        ".%s" % name[:-len(py_ext)], pkg_name)
                 except test.support.ResourceDenied:
                     if gui:
                         raise