make closing of custom stdout and stderr more strict

limwz01 · limwz01 · commit 86c68736a40d · 2024-12-18T17:21:30.000+08:00
diff --git a/ipykernel/kernelapp.py b/ipykernel/kernelapp.py
@@ -559,10 +559,11 @@ def reset_io(self):
                             "w",
                         )
                     )
-        stderr.close()
-        stdout.close()
+        if hasattr(sys.stderr, "_original_stdstream_copy"):
+            stderr.close()
+        if hasattr(sys.stdout, "_original_stdstream_copy"):
+            stdout.close()
         if self._blackhole:
-            # already closed by above but no harm calling again
             self._blackhole.close()
 
     def patch_io(self):

Original file line number	Diff line number	Diff line change
`@@ -559,10 +559,11 @@ def reset_io(self):`
`559`	`559`	`"w",`
`560`	`560`	`)`
`561`	`561`	`)`
`562`		`- stderr.close()`
`563`		`- stdout.close()`
	`562`	`+ if hasattr(sys.stderr, "_original_stdstream_copy"):`
	`563`	`+ stderr.close()`
	`564`	`+ if hasattr(sys.stdout, "_original_stdstream_copy"):`
	`565`	`+ stdout.close()`
`564`	`566`	`if self._blackhole:`
`565`		`- # already closed by above but no harm calling again`
`566`	`567`	`self._blackhole.close()`
`567`	`568`
`568`	`569`	`def patch_io(self):`