Issue #10736: Revert changeset de4d34a95603 as it causes failures with

old Apple-supplied Carbon Tk 8.4.

diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py
index f5c0f17dd0ff064ae971fda6c7d327b18eb2e8b6..cd00a61f85d9ae96ae2f77f17fabaeb919e3bd66 100644 (file)
--- a/Lib/tkinter/test/test_ttk/test_widgets.py
+++ b/Lib/tkinter/test/test_ttk/test_widgets.py
@@ -3,7 +3,6 @@ import tkinter
 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 @@ class NotebookTest(unittest.TestCase):
 
         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 @@ class NotebookTest(unittest.TestCase):
         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
index c9bcebba71a5ddc72444b4c15eda962e544f58f8..fde085b527d33458dea6750952bf1fe40319aafd 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -770,9 +770,6 @@ Extension Modules
 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.