Extra enter not required in pypy

thomasballinger · thomasballinger · commit 0662921cc4bb · 2015-03-07T08:52:30.000-05:00
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -284,12 +284,14 @@ def test_rewind_inconsistent_history_more_lines_same_screen(self):
         self.repl.width = 60
         sys.a = 5
         self.enter('import sys')
-        self.enter('for i in range(sys.a): print(sys.a)')
-        self.enter()
+        self.enter('for i in range(sys.a):')
+        self.enter('    print(sys.a)')
+        self.enter('')
         self.enter('1 + 1')
         self.enter('2 + 2')
         screen = ['>>> import sys',
-                  '>>> for i in range(sys.a): print(sys.a)',
+                  '>>> for i in range(sys.a):',
+                  '...     print(sys.a)',
                   '... ',
                   '5',
                   '5',
@@ -301,9 +303,9 @@ def test_rewind_inconsistent_history_more_lines_same_screen(self):
                   '>>> 2 + 2',
                   '4',
                   '>>> ']
-        self.assert_paint_ignoring_formatting(screen, (12, 4))
+        self.assert_paint_ignoring_formatting(screen, (13, 4))
         self.repl.scroll_offset += len(screen) - self.repl.height
-        self.assert_paint_ignoring_formatting(screen[8:], (4, 4))
+        self.assert_paint_ignoring_formatting(screen[9:], (4, 4))
         sys.a = 6
         self.undo()
         screen = [INCONSISTENT_HISTORY_MSG[:self.repl.width],
@@ -322,12 +324,14 @@ def test_rewind_inconsistent_history_more_lines_lower_screen(self):
         self.repl.width = 60
         sys.a = 5
         self.enter("import sys")
-        self.enter("for i in range(sys.a): print(sys.a)")
-        self.enter()
+        self.enter("for i in range(sys.a):")
+        self.enter("    print(sys.a)")
+        self.enter("")
         self.enter("1 + 1")
         self.enter("2 + 2")
         screen = [">>> import sys",
-                  ">>> for i in range(sys.a): print(sys.a)",
+                  ">>> for i in range(sys.a):",
+                  "...     print(sys.a)",
                   '... ',
                   '5',
                   '5',
@@ -339,9 +343,9 @@ def test_rewind_inconsistent_history_more_lines_lower_screen(self):
                   '>>> 2 + 2',
                   '4',
                   '>>> ']
-        self.assert_paint_ignoring_formatting(screen, (12, 4))
+        self.assert_paint_ignoring_formatting(screen, (13, 4))
         self.repl.scroll_offset += len(screen) - self.repl.height
-        self.assert_paint_ignoring_formatting(screen[8:], (4, 4))
+        self.assert_paint_ignoring_formatting(screen[9:], (4, 4))
         sys.a = 8
         self.undo()
         screen = [INCONSISTENT_HISTORY_MSG[:self.repl.width],
@@ -359,12 +363,14 @@ def test_rewind_inconsistent_history_more_lines_raise_screen(self):
         self.repl.width = 60
         sys.a = 5
         self.enter("import sys")
-        self.enter("for i in range(sys.a): print(sys.a)")
-        self.enter()
+        self.enter("for i in range(sys.a):")
+        self.enter("    print(sys.a)")
+        self.enter("")
         self.enter("1 + 1")
         self.enter("2 + 2")
         screen = [">>> import sys",
-                  ">>> for i in range(sys.a): print(sys.a)",
+                  ">>> for i in range(sys.a):",
+                  "...     print(sys.a)",
                   '... ',
                   '5',
                   '5',
@@ -376,9 +382,9 @@ def test_rewind_inconsistent_history_more_lines_raise_screen(self):
                   '>>> 2 + 2',
                   '4',
                   '>>> ']
-        self.assert_paint_ignoring_formatting(screen, (12, 4))
+        self.assert_paint_ignoring_formatting(screen, (13, 4))
         self.repl.scroll_offset += len(screen) - self.repl.height
-        self.assert_paint_ignoring_formatting(screen[8:], (4, 4))
+        self.assert_paint_ignoring_formatting(screen[9:], (4, 4))
         sys.a = 1
         self.undo()
         screen = [INCONSISTENT_HISTORY_MSG[:self.repl.width],
@@ -394,12 +400,14 @@ def test_rewind_inconsistent_history_more_lines_raise_screen(self):
     def test_rewind_history_not_quite_inconsistent(self):
         self.repl.width = 50
         sys.a = 5
-        self.enter("for i in range(__import__('sys').a): print(i)")
-        self.enter()
+        self.enter("for i in range(__import__('sys').a):")
+        self.enter("    print(i)")
+        self.enter("")
         self.enter("1 + 1")
         self.enter("2 + 2")
-        screen = [">>> for i in range(__import__('sys').a): print(i)",
-                  '... ',
+        screen = [">>> for i in range(__import__('sys').a):",
+                  "...     print(i)",
+                  "... ",
                   '0',
                   '1',
                   '2',
@@ -410,9 +418,9 @@ def test_rewind_history_not_quite_inconsistent(self):
                   '>>> 2 + 2',
                   '4',
                   '>>> ']
-        self.assert_paint_ignoring_formatting(screen, (11, 4))
+        self.assert_paint_ignoring_formatting(screen, (12, 4))
         self.repl.scroll_offset += len(screen) - self.repl.height
-        self.assert_paint_ignoring_formatting(screen[7:], (4, 4))
+        self.assert_paint_ignoring_formatting(screen[8:], (4, 4))
         sys.a = 6
         self.undo()
         screen = ['5',
