]> granicus.if.org Git - python/commitdiff
Issue #25456: Fix test_idle when Tcl/Tk DLLs are loaded from python.exe's home
authorZachary Ware <zachary.ware@gmail.com>
Sun, 25 Oct 2015 04:22:16 +0000 (23:22 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Sun, 25 Oct 2015 04:22:16 +0000 (23:22 -0500)
rather than from elsewhere on PATH.

Lib/test/test_idle.py

index 141e89e49318818488ba7909559201eeb4f0002a..132657b58ef7f5796a7fba8acc2e25e02e5a2ca3 100644 (file)
@@ -1,11 +1,13 @@
 import unittest
-from test import support
-from test.support import import_module
+from test.support import import_module, import_fresh_module
 
 # Skip test if _thread or _tkinter wasn't built or idlelib was deleted.
 import_module('threading')  # imported by PyShell, imports _thread
 tk = import_module('tkinter')  # imports _tkinter
 idletest = import_module('idlelib.idle_test')
+# Make sure TCL_LIBRARY is set properly on Windows.  Note that this will
+# cause a warning about test_idle modifying the environment
+import_fresh_module('tkinter._fix')
 
 # Without test_main present, regrtest.runtest_inner (line1219) calls
 # unittest.TestLoader().loadTestsFromModule(this_module) which calls