Merge with 3.5

terryjreedy · terryjreedy · commit 6f1f091e80d7 · 2015-09-22T21:11:06.000-04:00
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
@@ -175,13 +175,13 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
         if macosxSupport.isAquaTk():
             # Command-W on editorwindows doesn't work without this.
             text.bind('<<close-window>>', self.close_event)
-            # Some OS X systems have only one mouse button,
-            # so use control-click for pulldown menus there.
-            #  (Note, AquaTk defines <2> as the right button if
-            #   present and the Tk Text widget already binds <2>.)
+            # Some OS X systems have only one mouse button, so use
+            # control-click for popup context menus there. For two
+            # buttons, AquaTk defines <2> as the right button, not <3>.
             text.bind("<Control-Button-1>",self.right_menu_event)
+            text.bind("<2>", self.right_menu_event)
         else:
-            # Elsewhere, use right-click for pulldown menus.
+            # Elsewhere, use right-click for popup menus.
             text.bind("<3>",self.right_menu_event)
         text.bind("<<cut>>", self.cut)
         text.bind("<<copy>>", self.copy)
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
@@ -1547,6 +1547,14 @@ def main():
     root.withdraw()
     flist = PyShellFileList(root)
     macosxSupport.setupApp(root, flist)
+    
+    if macosxSupport.isAquaTk():
+        # There are some screwed up <2> class bindings for text
+        # widgets defined in Tk which we need to do away with.
+        # See issue #24801.
+        root.unbind_class('Text', '<B2>')
+        root.unbind_class('Text', '<B2-Motion>')
+        root.unbind_class('Text', '<<PasteSelection>>')
 
     if enable_edit:
         if not (cmd or script):
