fix-notebook-magic

Darshan808 · Darshan808 · commit 65308f0cc97f · 2025-09-24T12:34:20.000+05:45
diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
@@ -567,35 +567,75 @@ def notebook(self, s):
 
         if(len(hist)<=1):
             raise ValueError('History is empty, cannot export')
+
         for session, execution_count, source in hist[:-1]:
             cell = v4.new_code_cell(execution_count=execution_count, source=source)
+
             for output in outputs[execution_count]:
-                for mime_type, data in output.bundle.items():
-                    if output.output_type == "out_stream":
-                        text = data if isinstance(data, list) else [data]
-                        cell.outputs.append(v4.new_output("stream", text=text))
-                    elif output.output_type == "err_stream":
-                        text = data if isinstance(data, list) else [data]
-                        err_output = v4.new_output("stream", text=text)
-                        err_output.name = "stderr"
-                        cell.outputs.append(err_output)
-                    elif output.output_type == "execute_result":
-                        cell.outputs.append(
-                            v4.new_output(
-                                "execute_result",
-                                data={mime_type: data},
-                                execution_count=execution_count,
-                            )
+                if output.output_type == "out_stream":
+                    text_data = []
+                    for mime_type, data in output.bundle.items():
+                        if isinstance(data, list):
+                            text_data.extend(data)
+                        else:
+                            text_data.append(data)
+                    full_text = "".join(text_data)
+                    # Replace literal \n with actual newlines
+                    full_text = full_text.replace("\\n", "\n")
+                    normalized_text = []
+                    lines = full_text.split("\n")
+                    for i, line in enumerate(lines):
+                        if i < len(lines) - 1:
+                            normalized_text.append(line + "\n")
+                        elif line:  # Last line only if it's not empty
+                            normalized_text.append(line + "\n")
+                    cell.outputs.append(v4.new_output("stream", text=normalized_text))
+
+                elif output.output_type == "err_stream":
+                    text_data = []
+                    for mime_type, data in output.bundle.items():
+                        if isinstance(data, list):
+                            text_data.extend(data)
+                        else:
+                            text_data.append(data)
+                    full_text = "".join(text_data)
+                    full_text = full_text.replace("\\n", "\n")
+                    normalized_text = []
+                    lines = full_text.split("\n")
+                    for i, line in enumerate(lines):
+                        if i < len(lines) - 1:
+                            normalized_text.append(line + "\n")
+                        elif line:
+                            normalized_text.append(line + "\n")
+                    err_output = v4.new_output("stream", text=normalized_text)
+                    err_output.name = "stderr"
+                    cell.outputs.append(err_output)
+
+                elif output.output_type == "execute_result":
+                    data_dict = {}
+                    for mime_type, data in output.bundle.items():
+                        data_dict[mime_type] = data
+                    cell.outputs.append(
+                        v4.new_output(
+                            "execute_result",
+                            data=data_dict,
+                            execution_count=execution_count,
                         )
-                    elif output.output_type == "display_data":
-                        cell.outputs.append(
-                            v4.new_output(
-                                "display_data",
-                                data={mime_type: data},
-                            )
+                    )
+
+                elif output.output_type == "display_data":
+                    # Collect all MIME types for this display_data into a single output
+                    data_dict = {}
+                    for mime_type, data in output.bundle.items():
+                        data_dict[mime_type] = data
+                    cell.outputs.append(
+                        v4.new_output(
+                            "display_data",
+                            data=data_dict,
                         )
-                    else:
-                        raise ValueError(f"Unknown output type: {output.output_type}")
+                    )
+                else:
+                    raise ValueError(f"Unknown output type: {output.output_type}")
 
             # Check if this execution_count is in exceptions (current session)
             if execution_count in exceptions:
