From: Guilherme Polo <ggpolo@gmail.com>
Date: Sun, 1 Feb 2009 02:56:16 +0000 (+0000)
Subject: Restore Tkinter.Tk._loadtk so this test doesn't fail for problems
X-Git-Tag: v2.7a1~2145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b331dd3ea7492e363ad68cc49c4ee9a09a2ca79;p=python

Restore Tkinter.Tk._loadtk so this test doesn't fail for problems
related to ttk.
---

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 26e294ce13..7690fe1025 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -4,9 +4,15 @@ import unittest
 import os
 import _tkinter
 from test import test_support
-from Tkinter import Tcl
+from Tkinter import Tk, Tcl
 from _tkinter import TclError
 
+# Restore Tkinter.Tk._loadtk that may have been overridden by ttk.
+# If this is not done then this test may fail for reasons related
+# to ttk only (like failing to load the tile package).
+from ttk import __loadtk__
+Tk._loadtk = __loadtk__
+
 
 class TkinterTest(unittest.TestCase):