Make changes I requested.

python · terryjreedy · Aug 27, 2017 · Jun 9, 2017 · Jun 12, 2017 · Jun 14, 2017
commit ca95099e4d2d2eaafd329b89e583ddb88032a21c
diff --git a/Lib/idlelib/idle_test/test_outwin.py b/Lib/idlelib/idle_test/test_outwin.py
@@ -22,6 +22,7 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
+        cls.window.close()
         del cls.text, cls.window
         cls.root.destroy()
         del cls.root
@@ -114,7 +115,7 @@ def test_goto_file_line(self):
 
         w.flist = mock.Mock()
         gfl = w.flist.gotofileline = Func()
-        showerror = outwin.messagebox.showerror = Mbox_func()
+        showerror = w.showerror = Mbox_func()
 
         # No file/line number.
         w.write('Not a file line')
@@ -135,7 +136,7 @@ def test_goto_file_line(self):
         self.assertIsNone(w.goto_file_line())
         eq(gfl.args, (str(__file__), 42))
 
-        del w.flist.gotofileline, outwin.messagebox.showerror
+        del w.flist.gotofileline, w.showerror
 
 
 class ModuleFunctionTest(unittest.TestCase):

diff --git a/Lib/idlelib/outwin.py b/Lib/idlelib/outwin.py
@@ -80,8 +80,7 @@ def __init__(self, *args):
 
     # Customize EditorWindow
     def ispythonsource(self, filename):
-        "Control colorization of Python source."
-        # No colorization needed
+        "Python source is only part of output: do not colorize."
         return False
 
     def short_title(self):
@@ -90,7 +89,6 @@ def short_title(self):
 
     def maybesave(self):
         "Customize EditorWindow to not display save file messagebox."
-        # Override base class method -- don't ask any questions
         return 'yes' if self.get_saved() else 'no'
 
     # Act as output file
@@ -123,12 +121,12 @@ def writelines(self, lines):
             self.write(line)
 
     def flush(self):
-        """Flush file.
-
-        Provide file flush functionality for the window.
-        """
+        "No flushing needed as write() directly writes to widget."
         pass
 
+    def showerror(self, *args, **kwargs):
+        messagebox.showerror(*args, **kwargs)
+
     def goto_file_line(self, event=None):
         """Handle request to open file/line.
 
@@ -147,15 +145,14 @@ def goto_file_line(self, event=None):
                                  "insert -1line lineend")
             result = file_line_helper(line)
             if not result:
-                messagebox.showerror(
+                self.showerror(
                     "No special line",
                     "The line you point at doesn't look like "
                     "a valid file name followed by a line number.",
                     parent=self.text)
-                return None
+                return
         filename, lineno = result
         self.flist.gotofileline(filename, lineno)
-        return None
 
 
 # These classes are currently not used but might come in handy