Merge with 3.3

ae13ff1c · Terry Jan Reedy · 371f746b · e6a17862 · ae13ff1c
Commit ae13ff1c authored Jul 13, 2013 by Terry Jan Reedy
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Lib/idlelib/idle_test/test_text.py Lib/idlelib/idle_test/test_text.py +4 -1

No files found.
--- a/Lib/idlelib/idle_test/test_text.py
+++ b/Lib/idlelib/idle_test/test_text.py
@@ -216,7 +216,10 @@ class TkTextTest(TextTest, unittest.TestCase):
        requires('gui')
        from tkinter import Tk, Text
        cls.Text = Text
+        try:
            cls.root = Tk()
+        except TclError as msg:
+            raise unittest.SkipTest('TclError: %s' % msg)

    @classmethod
    def tearDownClass(cls):