Issue #18365: normalize whitespace

This commit is contained in:
Terry Jan Reedy 2013-07-12 20:16:28 -04:00
parent 21784da416
commit 04ff0382b2
2 changed files with 7 additions and 8 deletions

View File

@ -210,7 +210,7 @@ class Text:
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 @@ class Text:
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)

View File

@ -36,7 +36,7 @@ class TextTest(object):
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 @@ class TkTextTest(TextTest, unittest.TestCase):
if __name__ == '__main__':
unittest.main(verbosity=2, exit=False)