(original) (raw)

changeset: 84607:86cc1983a94d branch: 2.7 parent: 84602:5ac2ec0a34a5 user: Terry Jan Reedy tjreedy@udel.edu date: Fri Jul 12 20🔞33 2013 -0400 files: Lib/idlelib/idle_test/mock_tk.py Lib/idlelib/idle_test/test_text.py description: Issue #18365: normalize whitespace diff -r 5ac2ec0a34a5 -r 86cc1983a94d Lib/idlelib/idle_test/mock_tk.py --- a/Lib/idlelib/idle_test/mock_tk.py Fri Jul 12 20:10:17 2013 -0400 +++ b/Lib/idlelib/idle_test/mock_tk.py Fri Jul 12 20🔞33 2013 -0400 @@ -210,7 +210,7 @@ endline, endchar = startline+1, 0 else: # do not delete terminal \n if index1 == 'insert' - return + return else: endline, endchar = self._decode(index2, -1) # restricting end position to insert position excludes terminal \n @@ -219,11 +219,11 @@ self.data[startline] = self.data[startline][:startchar] + \ self.data[startline][endchar:] elif startline < endline: - self.data[startline] = self.data[startline][:startchar] + \ - self.data[endline][endchar:] - startline += 1 - for i in range(startline, endline+1): - del self.data[startline] + self.data[startline] = self.data[startline][:startchar] + \ + self.data[endline][endchar:] + startline += 1 + for i in range(startline, endline+1): + del self.data[startline] def compare(self, index1, op, index2): line1, char1 = self._decode(index1) diff -r 5ac2ec0a34a5 -r 86cc1983a94d Lib/idlelib/idle_test/test_text.py --- a/Lib/idlelib/idle_test/test_text.py Fri Jul 12 20:10:17 2013 -0400 +++ b/Lib/idlelib/idle_test/test_text.py Fri Jul 12 20🔞33 2013 -0400 @@ -36,7 +36,7 @@ self.assertEqual(index(dex), '1.0') for dex in '1.0 lineend', '1.end', '1.33': - self.assertEqual(index(dex), '1.5') + self.assertEqual(index(dex), '1.5') for dex in 'end', '33.44': self.assertEqual(index(dex), '3.0') @@ -225,4 +225,3 @@ if __name__ == '__main__': unittest.main(verbosity=2, exit=False) - /tjreedy@udel.edu