Merge pull request #4088 from jdfreder/coalfix

nbconvert: Fix coalescestreams line with incorrect nesting causing strange behavior closes #4015
ipython · Aug 29, 2013 · 31d73e5 · 31d73e5
2 parents 11babdf + 8c97505
commit 31d73e5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/IPython/nbconvert/preprocessors/coalescestreams.py b/IPython/nbconvert/preprocessors/coalescestreams.py
@@ -69,7 +69,7 @@ def coalesce_streams(cell, resources, index):
             last.text += output.text
         else:
             new_outputs.append(output)
-        last = output
+            last = output
 
     cell.outputs = new_outputs
     return cell, resources
diff --git a/IPython/nbconvert/preprocessors/tests/test_coalescestreams.py b/IPython/nbconvert/preprocessors/tests/test_coalescestreams.py
@@ -14,6 +14,8 @@
 # Imports
 #-----------------------------------------------------------------------------
 
+from IPython.nbformat import current as nbformat
+
 from .base import PreprocessorTestsBase
 from ..coalescestreams import coalesce_streams
 
@@ -35,4 +37,24 @@ def test_coalesce_streams(self):
         self.assertEqual(outputs[1].output_type, "text")
         self.assertEqual(outputs[2].text, "cd")
         self.assertEqual(outputs[3].text, "ef")
-
+
+
+    def test_coalesce_sequenced_streams(self):
+        """Can the coalesce streams preprocessor merge a sequence of streams?"""
+
+        outputs = [nbformat.new_output(output_type="stream", stream="stdout", output_text="0"),
+                   nbformat.new_output(output_type="stream", stream="stdout", output_text="1"),
+                   nbformat.new_output(output_type="stream", stream="stdout", output_text="2"),
+                   nbformat.new_output(output_type="stream", stream="stdout", output_text="3"),
+                   nbformat.new_output(output_type="stream", stream="stdout", output_text="4"),
+                   nbformat.new_output(output_type="stream", stream="stdout", output_text="5"),
+                   nbformat.new_output(output_type="stream", stream="stdout", output_text="6"),
+                   nbformat.new_output(output_type="stream", stream="stdout", output_text="7")]
+        cells=[nbformat.new_code_cell(input="# None", prompt_number=1,outputs=outputs)]
+        worksheets = [nbformat.new_worksheet(name="worksheet1", cells=cells)]
+
+        nb = nbformat.new_notebook(name="notebook1", worksheets=worksheets)
+        res = self.build_resources()
+        nb, res = coalesce_streams(nb, res)
+        outputs = nb.worksheets[0].cells[0].outputs
+        self.assertEqual(outputs[0].text, u'01234567')