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
........
This commit is contained in:
Benjamin Peterson 2009-02-06 03:01:24 +00:00
parent 7f9876c0da
commit 063ff65e2c
3 changed files with 28 additions and 31 deletions

View file

@ -9,6 +9,7 @@ Extensions also should live in packages following the same rule as above.
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 @@ def get_tests_modules(basepath=this_dir_path, gui=True, packages=None):
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