tests

Author: Wulian233

Lib/idlelib/idle_test/htest.py

@@ -264,8 +264,7 @@
     'file': 'replace',
     'kwds': {},
     'msg': "Click the 'Replace' button.\n"
-           "Test various replace options in the 'Replace dialog'.\n"
-           "Click [Close] or [X] to close the 'Replace Dialog'."
+           "Test various replace options in the 'Replace dialog'."
     }
 
 _scrolled_list_spec = {
@@ -281,15 +280,13 @@
     'file': 'search',
     'kwds': {},
     'msg': "Click the 'Search' button.\n"
-           "Test various search options in the 'Search dialog'.\n"
-           "Click [Close] or [X] to close the 'Search Dialog'."
+           "Test various search options in the 'Search dialog'."
     }
 
 _searchbase_spec = {
     'file': 'searchbase',
     'kwds': {},
-    'msg': "Check the appearance of the base search dialog\n"
-           "Its only action is to close."
+    'msg': "Check the appearance of the base search dialog"
     }
 
 show_idlehelp_spec = {

Lib/idlelib/idle_test/test_searchbase.py

@@ -85,7 +85,7 @@ def test_make_entry(self):
         equal(int(egi['row']), 0)
         equal(int(egi['column']), 1)
         equal(int(egi['rowspan']), 1)
-        equal(int(egi['columnspan']), 1)
+        equal(int(egi['columnspan']), 2)
         equal(self.dialog.row, 1)
 
     def test_create_entries(self):
@@ -148,12 +148,6 @@ def test_make_button(self):
     def test_create_command_buttons(self):
         self.dialog.frame = Frame(self.root)
         self.dialog.create_command_buttons()
-        # Look for close button command in buttonframe
-        closebuttoncommand = ''
-        for child in self.dialog.buttonframe.winfo_children():
-            if child['text'] == 'Close':
-                closebuttoncommand = child['command']
-        self.assertIn('close', closebuttoncommand)
 
 
 if __name__ == '__main__':

Lib/idlelib/replace.py

@@ -86,11 +86,11 @@ def find_it(self, event=None):
         "Handle the Find button."
         self.do_find(False)
 
-    def replace_it(self, event=None): 
+    def replace_it(self, event=None):
         """Only used in test case
-  
-        If the find is successful, then perform replace. 
-        """ 
+
+        If the find is successful, then perform replace.
+        """
         if self.do_find(self.ok):
             self.do_replace()