Fix None appearing when print expression is last line (#8)

Author: joshuadavidthomas

src/mcp_django_shell/shell.py

@@ -202,29 +202,33 @@ def __post_init__(self):
 
     @property
     def output(self) -> str:
-        value = repr(self.value)
-
-        if (
-            self.value is not None
-            and hasattr(self.value, "__iter__")
-            and not isinstance(self.value, str | dict)
-        ):
-            # Format querysets and lists nicely, overwriting `value` if successful
-            try:
-                items = list(self.value)
-                match len(items):
-                    case 0:
-                        value = "Empty queryset/list"
-                    case n if n > 10:
-                        formatted = "\n".join(repr(item) for item in items[:10])
-                        value = f"{formatted}\n... and {n - 10} more items"
-                    case _:
-                        value = "\n".join(repr(item) for item in items)
-            except Exception:
-                # If iteration fails for any reason, just use the repr
-                pass
-
-        return self.stdout + value or value
+        parts = []
+
+        if self.stdout:
+            parts.append(self.stdout.strip())
+
+        if self.value is not None:
+            if hasattr(self.value, "__iter__") and not isinstance(
+                self.value, str | dict
+            ):
+                # Format querysets and lists nicely
+                try:
+                    items = list(self.value)
+                    match len(items):
+                        case 0:
+                            parts.append("Empty queryset/list")
+                        case n if n > 10:
+                            parts.extend(repr(item) for item in items[:10])
+                            parts.append(f"... and {n - 10} more items")
+                        case _:
+                            parts.extend(repr(item) for item in items)
+                except Exception:
+                    # If iteration fails, fall back to repr
+                    parts.append(repr(self.value))
+            else:
+                parts.append(repr(self.value))
+
+        return "\n".join(parts)
 
 
 @dataclass

tests/test_shell.py

@@ -154,6 +154,19 @@ def test_execute_print_captures_stdout(self, shell):
         assert result.value is None
         assert "Hello, World!" in result.output
 
+    def test_multiline_ending_with_print_no_none(self, shell):
+        code = """
+x = 5
+y = 10
+print(f"Sum: {x + y}")
+"""
+        result = shell._execute(code.strip())
+
+        assert isinstance(result, ExpressionResult)
+        assert result.value is None
+        assert "Sum: 15" in result.output
+        assert result.output == "Sum: 15"
+
     def test_execute_invalid_code_returns_error(self, shell):
         result = shell._execute("1 / 0")