Merge pull request #2110 from asmeurer/inputsplitter

Fixes and improvements to the input splitter

This fixes  #2108 (see the commit message for more details), and also now break, and continue will automatically deindent.

IPython/core/inputsplitter.py

@@ -115,7 +115,9 b" dedent_re = re.compile('|'.join(["
     r'^\s+raise\([^\)]*\).*$', # wacky raise with immediate open paren
     r'^\s+return(\s.*)?$', # normal return (+ space + other stuff, maybe)
     r'^\s+return\([^\)]*\).*$', # wacky return with immediate open paren
-    r'^\s+pass\s*$' # pass (optionally followed by trailing spaces)
+    r'^\s+pass\s*$', # pass (optionally followed by trailing spaces)
+    r'^\s+break\s*$', # break (optionally followed by trailing spaces)
+    r'^\s+continue\s*$', # continue (optionally followed by trailing spaces)
 ]))
 ini_spaces_re = re.compile(r'^([ \t\r\f\v]+)')
 
@@ -369,7 +371,7 b' class InputSplitter(object):'
         self.code, self._is_complete = None, None
 
         # Honor termination lines properly
-        if source.rstrip().endswith('\\'):
+        if source.endswith('\\\n'):
             return False
 
         self._update_indent(lines)

IPython/core/tests/test_inputsplitter.py

@@ -227,6 +227,26 b' class InputSplitterTestCase(unittest.TestCase):'
         isp.push('if 1:\n     pass   ')
         self.assertEqual(isp.indent_spaces, 0)
 
+    def test_dedent_break(self):
+        isp = self.isp # shorthand
+        # should NOT cause dedent
+        isp.push('while 1:\n    breaks = 5')
+        self.assertEqual(isp.indent_spaces, 4)
+        isp.push('while 1:\n     break')
+        self.assertEqual(isp.indent_spaces, 0)
+        isp.push('while 1:\n     break   ')
+        self.assertEqual(isp.indent_spaces, 0)
+
+    def test_dedent_continue(self):
+        isp = self.isp # shorthand
+        # should NOT cause dedent
+        isp.push('while 1:\n    continues = 5')
+        self.assertEqual(isp.indent_spaces, 4)
+        isp.push('while 1:\n     continue')
+        self.assertEqual(isp.indent_spaces, 0)
+        isp.push('while 1:\n     continue   ')
+        self.assertEqual(isp.indent_spaces, 0)
+
     def test_dedent_raise(self):
         isp = self.isp # shorthand
         # should NOT cause dedent
@@ -351,6 +371,22 b' class InputSplitterTestCase(unittest.TestCase):'
         self.isp.push(u'\xc3\xa9')
         self.isp.push(u"u'\xc3\xa9'")
 
+    def test_line_continuation(self):
+        """ Test issue #2108."""
+        isp = self.isp
+        # A blank line after a line continuation should not accept more
+        isp.push("1 \\\n\n")
+        self.assertFalse(isp.push_accepts_more())
+        # Whitespace after a \ is a SyntaxError.  The only way to test that
+        # here is to test that push doesn't accept more (as with
+        # test_syntax_error() above).
+        isp.push(r"1 \ ")
+        self.assertFalse(isp.push_accepts_more())
+        # Even if the line is continuable (c.f. the regular Python
+        # interpreter)
+        isp.push(r"(1 \ ")
+        self.assertFalse(isp.push_accepts_more())
+
 class InteractiveLoopTestCase(unittest.TestCase):
     """Tests for an interactive loop like a python shell.
     """

README.rst

@@ -9,7 +9,7 b' Welcome to IPython. Our full documentation is available on `our website'
 <http://ipython.org/documentation.html>`_; if you downloaded a built source
 distribution the ``docs/source`` directory contains the plaintext version of
 these manuals.  If you have Sphinx installed, you can build them by typing
-``make html`` for local browsing.
+``cd docs; make html`` for local browsing.
 
 
 Dependencies and supported Python versions