[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

[terry.reedy]

http://hg.python.org/cpython/rev/f8c0062aa12c
changeset:   84890:f8c0062aa12c
parent:      84888:b20a10c97e08
parent:      84889:c57b2a344097
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sun Jul 28 16:25:52 2013 -0400
summary:
  Merge with 3.3

files:
  Lib/idlelib/idle_test/test_text.py |  5 +----
  1 files changed, 1 insertions(+), 4 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,10 +216,7 @@
         requires('gui')
         from tkinter import Tk, Text
         cls.Text = Text
-        try:
-            cls.root = Tk()
-        except TclError as msg:
-            raise unittest.SkipTest('TclError: %s' % msg)
+        cls.root = Tk()
 
     @classmethod
     def tearDownClass(cls):

-- 
Repository URL: http://hg.python.org/cpython