Issue #29392: Prevent crash when passing invalid arguments into msvcrt module.

1 files changed, 16 insertions, 14 deletions

diff --git a/Lib/idlelib/idle_test/test_editmenu.py b/Lib/idlelib/idle_test/test_editmenu.py
index a258e29e0f..17eb25c4b4 100644
--- a/Lib/idlelib/idle_test/test_editmenu.py
+++ b/Lib/idlelib/idle_test/test_editmenu.py
@@ -5,8 +5,9 @@ Edit modules have their own test files files
 from test.support import requires
 requires('gui')
 import tkinter as tk
+from tkinter import ttk
 import unittest
-from idlelib import PyShell
+from idlelib import pyshell
 
 class PasteTest(unittest.TestCase):
     '''Test pasting into widgets that allow pasting.
@@ -16,17 +17,18 @@ class PasteTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.root = root = tk.Tk()
-        root.withdraw()
-        PyShell.fix_x11_paste(root)
+        cls.root.withdraw()
+        pyshell.fix_x11_paste(root)
         cls.text = tk.Text(root)
         cls.entry = tk.Entry(root)
+        cls.tentry = ttk.Entry(root)
         cls.spin = tk.Spinbox(root)
         root.clipboard_clear()
         root.clipboard_append('two')
 
     @classmethod
     def tearDownClass(cls):
-        del cls.text, cls.entry, cls.spin
+        del cls.text, cls.entry, cls.tentry
         cls.root.clipboard_clear()
         cls.root.update_idletasks()
         cls.root.destroy()
@@ -44,16 +46,16 @@ class PasteTest(unittest.TestCase):
 
     def test_paste_entry(self):
         "Test pasting into an entry with and without a selection."
-        # On 3.6, generated <<Paste>> fails without empty select range
-        # for 'no selection'.  Live widget works fine.
-        entry = self.entry
-        for end, ans in (0, 'onetwo'), ('end', 'two'):
-            with self.subTest(entry=entry, end=end, ans=ans):
-                entry.delete(0, 'end')
-                entry.insert(0, 'one')
-                entry.select_range(0, end)  # see note
-                entry.event_generate('<<Paste>>')
-                self.assertEqual(entry.get(), ans)
+        # Generated <<Paste>> fails for tk entry without empty select
+        # range for 'no selection'.  Live widget works fine.
+        for entry in self.entry, self.tentry:
+            for end, ans in (0, 'onetwo'), ('end', 'two'):
+                with self.subTest(entry=entry, end=end, ans=ans):
+                    entry.delete(0, 'end')
+                    entry.insert(0, 'one')
+                    entry.select_range(0, end)
+                    entry.event_generate('<<Paste>>')
+                    self.assertEqual(entry.get(), ans)
 
     def test_paste_spin(self):
         "Test pasting into a spinbox with and without a selection."