[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

[terry.reedy]

http://hg.python.org/cpython/rev/514cb18945aa
changeset:   84606:514cb18945aa
parent:      84604:979905090779
parent:      84605:5611d3a954f8
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Jul 12 20:17:00 2013 -0400
summary:
  Merge with 3.3

files:
  Lib/idlelib/idle_test/mock_tk.py   |  12 ++++++------
  Lib/idlelib/idle_test/test_text.py |   3 +--
  2 files changed, 7 insertions(+), 8 deletions(-)


diff --git a/Lib/idlelib/idle_test/mock_tk.py b/Lib/idlelib/idle_test/mock_tk.py
--- a/Lib/idlelib/idle_test/mock_tk.py
+++ b/Lib/idlelib/idle_test/mock_tk.py
@@ -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 --git a/Lib/idlelib/idle_test/test_text.py b/Lib/idlelib/idle_test/test_text.py
--- a/Lib/idlelib/idle_test/test_text.py
+++ b/Lib/idlelib/idle_test/test_text.py
@@ -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)
-

-- 
Repository URL: http://hg.python.org/cpython