[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

[terry.reedy]

http://hg.python.org/cpython/rev/44efcdf221f7
changeset:   82680:44efcdf221f7
parent:      82677:07e0cd0d39b3
parent:      82679:596e8855895e
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sat Mar 16 02:52:24 2013 -0400
summary:
  Merge with 3.3

files:
  Lib/test/test_tcl.py          |  3 +++
  Lib/test/test_tk.py           |  3 +++
  Lib/test/test_ttk_guionly.py  |  3 +++
  Lib/test/test_ttk_textonly.py |  3 +++
  Misc/NEWS                     |  3 +++
  5 files changed, 15 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -8,6 +8,9 @@
 # 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
--- a/Lib/test/test_tk.py
+++ b/Lib/test/test_tk.py
@@ -2,6 +2,9 @@
 # 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
--- a/Lib/test/test_ttk_guionly.py
+++ b/Lib/test/test_ttk_guionly.py
@@ -5,6 +5,9 @@
 # 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
--- a/Lib/test/test_ttk_textonly.py
+++ b/Lib/test/test_ttk_textonly.py
@@ -4,6 +4,9 @@
 # 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():
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -932,6 +932,9 @@
 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

-- 
Repository URL: http://hg.python.org/cpython