Merge with 3.3

This commit is contained in:
Terry Jan Reedy 2013-03-16 02:52:24 -04:00
commit 1faba025e9
5 changed files with 15 additions and 0 deletions

View File

@ -8,6 +8,9 @@ from test import support
# Skip this test if the _tkinter module wasn't built. # Skip this test if the _tkinter module wasn't built.
_tkinter = support.import_module('_tkinter') _tkinter = support.import_module('_tkinter')
# Make sure tkinter._fix runs to set up the environment
support.import_fresh_module('tkinter')
from tkinter import Tcl from tkinter import Tcl
from _tkinter import TclError from _tkinter import TclError

View File

@ -2,6 +2,9 @@ from test import support
# Skip test if _tkinter wasn't built. # Skip test if _tkinter wasn't built.
support.import_module('_tkinter') support.import_module('_tkinter')
# Make sure tkinter._fix runs to set up the environment
support.import_fresh_module('tkinter')
# Skip test if tk cannot be initialized. # Skip test if tk cannot be initialized.
from tkinter.test.support import check_tk_availability from tkinter.test.support import check_tk_availability
check_tk_availability() check_tk_availability()

View File

@ -5,6 +5,9 @@ from test import support
# Skip this test if _tkinter wasn't built. # Skip this test if _tkinter wasn't built.
support.import_module('_tkinter') support.import_module('_tkinter')
# Make sure tkinter._fix runs to set up the environment
support.import_fresh_module('tkinter')
# Skip test if tk cannot be initialized. # Skip test if tk cannot be initialized.
from tkinter.test.support import check_tk_availability from tkinter.test.support import check_tk_availability
check_tk_availability() check_tk_availability()

View File

@ -4,6 +4,9 @@ from test import support
# Skip this test if _tkinter does not exist. # Skip this test if _tkinter does not exist.
support.import_module('_tkinter') support.import_module('_tkinter')
# Make sure tkinter._fix runs to set up the environment
support.import_fresh_module('tkinter')
from tkinter.test import runtktests from tkinter.test import runtktests
def test_main(): def test_main():

View File

@ -932,6 +932,9 @@ Extension Modules
Tests Tests
----- -----
- Issue #10652: make tcl/tk tests run after __all__ test, patch by
Zachary Ware.
- Issue #11963: remove human verification from test_parser and test_subprocess. - Issue #11963: remove human verification from test_parser and test_subprocess.
- Issue #11732: add a new suppress_crash_popup() context manager to test.support - Issue #11732: add a new suppress_crash_popup() context manager to test.support