summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-03-16 06:52:24 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-03-16 06:52:24 (GMT)
commit1faba025e90276c2df8c46ee5d770c09e1db30b1 (patch)
tree7be964068884c03d744876dae46befd4ac3507a8 /Lib
parent2fab35877d3c67057d02dac2cac374222c6ca079 (diff)
parentb73ac548353c11f2203d51c85d052231d9d305cc (diff)
downloadcpython-1faba025e90276c2df8c46ee5d770c09e1db30b1.zip
cpython-1faba025e90276c2df8c46ee5d770c09e1db30b1.tar.gz
cpython-1faba025e90276c2df8c46ee5d770c09e1db30b1.tar.bz2
Merge with 3.3
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_tcl.py3
-rw-r--r--Lib/test/test_tk.py3
-rw-r--r--Lib/test/test_ttk_guionly.py3
-rw-r--r--Lib/test/test_ttk_textonly.py3
4 files changed, 12 insertions, 0 deletions
diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index d38c0b5..0cc21c9 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -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
diff --git a/Lib/test/test_tk.py b/Lib/test/test_tk.py
index f993c53..7551a7f 100644
--- a/Lib/test/test_tk.py
+++ b/Lib/test/test_tk.py
@@ -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()
diff --git a/Lib/test/test_ttk_guionly.py b/Lib/test/test_ttk_guionly.py
index b8c1a4c..3a3459b 100644
--- a/Lib/test/test_ttk_guionly.py
+++ b/Lib/test/test_ttk_guionly.py
@@ -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()
diff --git a/Lib/test/test_ttk_textonly.py b/Lib/test/test_ttk_textonly.py
index 566fc9d..1cfeb15 100644
--- a/Lib/test/test_ttk_textonly.py
+++ b/Lib/test/test_ttk_textonly.py
@@ -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():