[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3
terry.reedy
python-checkins at python.org
Sat Jul 13 10:07:06 CEST 2013
http://hg.python.org/cpython/rev/f478eb9adfe0
changeset: 84616:f478eb9adfe0
parent: 84614:ffd923b388d8
parent: 84615:bc3a34e47923
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sat Jul 13 04:06:03 2013 -0400
summary:
Merge with 3.3
files:
Lib/idlelib/idle_test/test_text.py | 5 ++++-
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
--- a/Lib/idlelib/idle_test/test_text.py
+++ b/Lib/idlelib/idle_test/test_text.py
@@ -216,7 +216,10 @@
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):
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list