[Python-checkins] cpython: Issue #10736: Revert changeset de4d34a95603 as it causes failures with

[ned.deily]

http://hg.python.org/cpython/rev/c2f61149764e
changeset:   70511:c2f61149764e
user:        Ned Deily <nad at acm.org>
date:        Sun May 29 15:39:11 2011 -0700
summary:
  Issue #10736: Revert changeset de4d34a95603 as it causes failures with
old Apple-supplied Carbon Tk 8.4.

files:
  Lib/tkinter/test/test_ttk/test_widgets.py |  20 ++--------
  Misc/NEWS                                 |   3 -
  2 files changed, 4 insertions(+), 19 deletions(-)


diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py
--- a/Lib/tkinter/test/test_ttk/test_widgets.py
+++ b/Lib/tkinter/test/test_ttk/test_widgets.py
@@ -3,7 +3,6 @@
 import os
 from tkinter import ttk
 from test.support import requires, run_unittest
-import sys
 
 import tkinter.test.support as support
 from tkinter.test.test_ttk.test_functions import MockTclObj, MockStateSpec
@@ -562,19 +561,11 @@
 
         self.nb.pack()
         self.nb.wait_visibility()
-        if sys.platform == 'darwin':
-            tb_idx = "@20,5"
-        else:
-            tb_idx = "@5,5"
-        self.assertEqual(self.nb.tab(tb_idx), self.nb.tab('current'))
+        self.assertEqual(self.nb.tab('@5,5'), self.nb.tab('current'))
 
         for i in range(5, 100, 5):
-            try:
-                if self.nb.tab('@%d, 5' % i, text=None) == 'a':
-                    break
-            except tkinter.TclError:
-                pass
-
+            if self.nb.tab('@%d, 5' % i, text=None) == 'a':
+                break
         else:
             self.fail("Tab with text 'a' not found")
 
@@ -731,10 +722,7 @@
         self.nb.enable_traversal()
         self.nb.focus_force()
         support.simulate_mouse_click(self.nb, 5, 5)
-        if sys.platform == 'darwin':
-            self.nb.event_generate('<Option-a>')
-        else:
-            self.nb.event_generate('<Alt-a>')
+        self.nb.event_generate('<Alt-a>')
         self.assertEqual(self.nb.select(), str(self.child1))
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -770,9 +770,6 @@
 Tests
 -----
 
-- Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9
-  on Mac OS X.  (Patch by Ronald Oussoren)
-
 - Issue #12180: Fixed a few remaining errors in test_packaging when no
   threading.
 

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