summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-07-13 08:06:03 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-07-13 08:06:03 (GMT)
commitae13ff1c5fc18f049c4641a02246799f30e07385 (patch)
treee078eeca7694a04baa6cd70bab97fb7269978369 /Lib/idlelib
parent371f746bdcfc54e7e6dbfaee81503e18935668bd (diff)
parente6a17862e7f5739a669a98c2699a595a03fbe364 (diff)
downloadcpython-ae13ff1c5fc18f049c4641a02246799f30e07385.zip
cpython-ae13ff1c5fc18f049c4641a02246799f30e07385.tar.gz
cpython-ae13ff1c5fc18f049c4641a02246799f30e07385.tar.bz2
Merge with 3.3
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/idle_test/test_text.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/idlelib/idle_test/test_text.py b/Lib/idlelib/idle_test/test_text.py
index 367bf38..46af599 100644
--- 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
- cls.root = Tk()
+ try:
+ cls.root = Tk()
+ except TclError as msg:
+ raise unittest.SkipTest('TclError: %s' % msg)
@classmethod
def tearDownClass(cls):