Merge pull request #265 from takluyver/cell-magic-is-complete

minrk · web-flow · commit 29abbedcd0ed · 2017-09-18T13:23:08.000+02:00
Fix is_complete response with cell magics
diff --git a/ipykernel/ipkernel.py b/ipykernel/ipkernel.py
@@ -355,7 +355,7 @@ def do_shutdown(self, restart):
         return dict(status='ok', restart=restart)
 
     def do_is_complete(self, code):
-        status, indent_spaces = self.shell.input_transformer_manager.check_complete(code)
+        status, indent_spaces = self.shell.input_splitter.check_complete(code)
         r = {'status': status}
         if status == 'incomplete':
             r['indent'] = ' ' * indent_spaces
diff --git a/ipykernel/tests/test_kernel.py b/ipykernel/tests/test_kernel.py
@@ -224,7 +224,7 @@ def test_is_complete():
         reply = kc.get_shell_msg(block=True, timeout=TIMEOUT)
         assert reply['content']['status'] == 'complete'
 
-        # SyntaxError should mean it's complete
+        # SyntaxError
         kc.is_complete('raise = 2')
         reply = kc.get_shell_msg(block=True, timeout=TIMEOUT)
         assert reply['content']['status'] == 'invalid'
@@ -234,6 +234,11 @@ def test_is_complete():
         assert reply['content']['status'] == 'incomplete'
         assert reply['content']['indent'] == ''
 
+        # Cell magic ends on two blank lines for console UIs
+        kc.is_complete('%%timeit\na\n\n')
+        reply = kc.get_shell_msg(block=True, timeout=TIMEOUT)
+        assert reply['content']['status'] == 'complete'
+
 
 def test_complete():
     with kernel() as kc:
