static

Author: johnzhou721

Lib/idlelib/editor.py

@@ -1338,8 +1338,7 @@ def set_indentation_params(self, is_py_src, guess=True):
                 self.usetabs = False
         self.set_tk_tabwidth(self.tabwidth)
 
-    @staticmethod
-    def delete_trail_whitespace(want, chars, tabwidth):
+    def delete_trail_whitespace(self, want, chars, tabwidth):
         ncharsdeleted = 0
         have = len(chars.expandtabs(tabwidth))
         for i in range(len(chars) - 1, -1, -1):
@@ -1383,7 +1382,7 @@ def smart_backspace_event(self, event):
         assert have > 0
         want = ((have - 1) // self.indentwidth) * self.indentwidth
         # Debug prompt is multilined....
-        ncharsdeleted, chars = TestWindow.delete_trail_whitespace(want, chars, tabwidth)
+        ncharsdeleted, chars = self.delete_trail_whitespace(want, chars, tabwidth)
         text.undo_block_start()
         text.delete("insert-%dc" % ncharsdeleted, "insert")
         if have < want:

Lib/idlelib/idle_test/test_editor.py

@@ -240,13 +240,15 @@ def test_rclick(self):
 class DeleteWantTest(unittest.TestCase):
 
     def test_delete_trail_whitespace(self):
-        test_str = "abcde" + 10000 * "\t" + 10000 * " "
-        res_str = Editor.delete_trail_whitespace(30000, test_str, 4)[1]
-        self.assertEqual(res_str, "abcde" + 7498 * "\t")
-        res_str = Editor.delete_trail_whitespace(41005, test_str, 4)[1]
-        self.assertEqual(res_str, "abcde" + 10000 * "\t" + 1000 * " ")
-        res_str = Editor.delete_trail_whitespace(4, test_str, 4)[1]
-        self.assertEqual(res_str, "abcd")
+        with unittest.mock.patch.object(Editor, '__init__', return_value=None) as mock_init:
+            ew = Editor()
+            test_str = "abcde" + 10000 * "\t" + 10000 * " "
+            res_str = ew.delete_trail_whitespace(30000, test_str, 4)[1]
+            self.assertEqual(res_str, "abcde" + 7498 * "\t")
+            res_str = ew.delete_trail_whitespace(41005, test_str, 4)[1]
+            self.assertEqual(res_str, "abcde" + 10000 * "\t" + 1000 * " ")
+            res_str = ew.delete_trail_whitespace(4, test_str, 4)[1]
+            self.assertEqual(res_str, "abcd")
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)