move 'copy' and 'preview' squeezed output actions to a context menu

Author: taleinat

Lib/idlelib/idle_test/test_squeezer.py

@@ -8,6 +8,7 @@
 from idlelib.config import idleConf
 from idlelib.squeezer import count_lines_with_wrapping, ExpandingButton, \
     Squeezer
+from idlelib import macosx
 from idlelib.textview import view_text
 from idlelib.tooltip import Hovertip
 from idlelib.pyshell import PyShell
@@ -452,8 +453,8 @@ def test_init_no_tooltip(self, MockHovertip):
 
         # check that the mouse events are bound
         self.assertIn('<Double-Button-1>', expandingbutton.bind())
-        self.assertIn('<Button-2>', expandingbutton.bind())
-        self.assertIn('<Button-3>', expandingbutton.bind())
+        right_button_code = '<Button-%s>' % ('2' if macosx.isAquaTk() else '3')
+        self.assertIn(right_button_code, expandingbutton.bind())
 
     @patch('idlelib.squeezer.Hovertip', autospec=Hovertip)
     def test_init_tooltip(self, MockHovertip):
@@ -564,13 +565,6 @@ def test_copy(self):
         self.assertEqual(expandingbutton.clipboard_append.call_count, 1)
         expandingbutton.clipboard_append.assert_called_with('TEXT')
 
-    def _file_cleanup(self, filename):
-        if os.path.exists(filename):
-            try:
-                os.remove(filename)
-            except OSError:
-                pass
-
     def test_preview(self):
         """test the preview event"""
         squeezer = self.make_mock_squeezer()
@@ -587,3 +581,19 @@ def test_preview(self):
 
             # check that the proper text was passed
             self.assertEqual(mock_view_text.call_args[0][2], 'TEXT')
+
+    def test_rmenu(self):
+        """test the context menu"""
+        squeezer = self.make_mock_squeezer()
+        expandingbutton = ExpandingButton('TEXT', 'TAGS', 50, squeezer)
+        with patch('tkinter.Menu') as mock_Menu:
+            mock_menu = Mock()
+            mock_Menu.return_value = mock_menu
+            mock_event = Mock()
+            mock_event.x = 10
+            mock_event.y = 10
+            expandingbutton.context_menu_event(event=mock_event)
+            self.assertEqual(mock_menu.add_command.call_count,
+                             len(expandingbutton.rmenu_specs))
+            for label, *data in expandingbutton.rmenu_specs:
+                mock_menu.add_command.assert_any_call(label=label, command=ANY)

Lib/idlelib/squeezer.py

@@ -23,6 +23,7 @@
 from idlelib.config import idleConf
 from idlelib.textview import view_text
 from idlelib.tooltip import Hovertip
+from idlelib import macosx
 
 
 def _add_to_rmenu(editwin, specs):
@@ -122,15 +123,17 @@ def __init__(self, s, tags, numoflines, squeezer):
 
         if self.squeezer.should_show_tooltip:
             button_tooltip_text = (
-                "Double-click to expand, middle-click to copy, " +
-                "right-click to preview."
+                "Double-click to expand, right-click for more options."
             )
             Hovertip(self, button_tooltip_text,
                      hover_delay=self.squeezer.tooltip_delay)
 
         self.bind("<Double-Button-1>", self.expand)
-        self.bind("<Button-2>", self.copy)
-        self.bind("<Button-3>", self.preview)
+        if macosx.isAquaTk():
+            # AquaTk defines <2> as the right button, not <3>.
+            self.bind("<Button-2>", self.context_menu_event)
+        else:
+            self.bind("<Button-3>", self.context_menu_event)
         self.selection_handle(
             lambda offset, length: s[int(offset):int(offset) + int(length)])
 
@@ -148,7 +151,7 @@ def set_is_dangerous(self):
             )
         )
 
-    def expand(self, event):
+    def expand(self, event=None):
         """expand event handler
 
         This inserts the original text in place of the button in the Text
@@ -177,21 +180,35 @@ def expand(self, event):
         self.base_text.delete(self)
         self.squeezer.expandingbuttons.remove(self)
 
-    def copy(self, event):
+    def copy(self, event=None):
         """copy event handler
 
         Copy the original text to the clipboard.
         """
         self.clipboard_clear()
         self.clipboard_append(self.s)
 
-    def preview(self, event):
+    def preview(self, event=None):
         """preview event handler
 
         View the original text in a separate text viewer window.
         """
         view_text(self.text, "Squeezed Output Viewer", self.s, wrap='none')
 
+    rmenu_specs = (
+        # item structure: (label, method_name)
+        ('copy', 'copy'),
+        ('preview', 'preview'),
+    )
+
+    def context_menu_event(self, event):
+        self.text.mark_set("insert", "@%d,%d" % (event.x, event.y))
+        rmenu = tk.Menu(self.text, tearoff=0)
+        for label, method_name in self.rmenu_specs:
+            rmenu.add_command(label=label, command=getattr(self, method_name))
+        rmenu.tk_popup(event.x_root, event.y_root)
+        return "break"
+
 
 class Squeezer:
     """Replace long outputs in the shell with a simple button.