diff -r 7268838063e1 Lib/test/test_support.py --- a/Lib/test/test_support.py Tue Nov 05 00:24:05 2013 +1000 +++ b/Lib/test/test_support.py Mon Nov 04 15:07:19 2013 -0600 @@ -26,6 +26,18 @@ except ImportError: thread = None +# Issue #10652: Do Tkinter's environment fixing to find the Tcl/Tk/Tix +# libraries early and only once to avoid issues with test_tcl, test_tk, etc. +# not finding init.tcl. We only want the side effect of this import, and it +# doesn't matter if it fails because that will mean the tests wouldn't have +# worked anyway. +try: + import FixTk +except Exception: + pass +else: + del FixTk + __all__ = ["Error", "TestFailed", "ResourceDenied", "import_module", "verbose", "use_resources", "max_memuse", "record_original_stdout", "get_original_stdout", "unload", "unlink", "rmtree", "forget",