Merge with 3.3
This commit is contained in:
commit
1faba025e9
|
@ -8,6 +8,9 @@ from test import support
|
|||
# Skip this test if the _tkinter module wasn't built.
|
||||
_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 TclError
|
||||
|
||||
|
|
|
@ -2,6 +2,9 @@ from test import support
|
|||
# Skip test if _tkinter wasn't built.
|
||||
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.
|
||||
from tkinter.test.support import check_tk_availability
|
||||
check_tk_availability()
|
||||
|
|
|
@ -5,6 +5,9 @@ from test import support
|
|||
# Skip this test if _tkinter wasn't built.
|
||||
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.
|
||||
from tkinter.test.support import check_tk_availability
|
||||
check_tk_availability()
|
||||
|
|
|
@ -4,6 +4,9 @@ from test import support
|
|||
# Skip this test if _tkinter does not exist.
|
||||
support.import_module('_tkinter')
|
||||
|
||||
# Make sure tkinter._fix runs to set up the environment
|
||||
support.import_fresh_module('tkinter')
|
||||
|
||||
from tkinter.test import runtktests
|
||||
|
||||
def test_main():
|
||||
|
|
|
@ -932,6 +932,9 @@ Extension Modules
|
|||
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 #11732: add a new suppress_crash_popup() context manager to test.support
|
||||
|
|
Loading…
Reference in New Issue