Updates and slight refactor in fix

Author: bdbaddog

CHANGES.txt

@@ -18,6 +18,10 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       will benefit from `TypeGuard`/`TypeIs`, to produce intellisense similar
       to using `isinstance` directly.
 
+  From Anthony Siegrist;
+    - On win32 platform, handle piped process output more robustly. Output encoding
+      fallback to UTF8 if it is defined at None by the output stream object.
+
   From Mats Wichmann:
     - env.Dump() now considers the "key" positional argument to be a varargs
       type (zero, one or many). However called, it returns a serialized
@@ -41,9 +45,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       Make doc function signature style more consistent - tweaks to AddOption,
       DefaultEnvironment and Tool,.
 
-  From Anthony Siegrist;
-    - On win32 platform, handle piped process output more robustly. Output encoding
-      fallback to UTF8 if it is defined at None by the output stream object.
+
 
 
 RELEASE 4.8.0 -  Sun, 07 Jul 2024 17:22:20 -0700

SCons/Platform/win32.py

@@ -148,6 +148,12 @@ def piped_spawn(sh, escape, cmd, args, env, stdout, stderr):
     if not stderrRedirected:
         args.append("2>" + tmpFileStderrName)
 
+    # Sanitize encoding. None is not a valid encoding.
+    if stdout.encoding is None:
+        stdout.encoding = 'utf-8'
+    if stderr.encoding is None:
+        stderr.encoding = 'utf-8'
+
     # actually do the spawn
     try:
         args = [sh, '/C', escape(' '.join(args))]
@@ -167,7 +173,7 @@ def piped_spawn(sh, escape, cmd, args, env, stdout, stderr):
         try:
             with open(tmpFileStdoutName, "rb") as tmpFileStdout:
                 output = tmpFileStdout.read()
-                stdout.write(output.decode(stdout.encoding if stdout.encoding is not None else 'utf-8', "replace"))
+                stdout.write(output.decode(stdout.encoding, "replace"))
             os.remove(tmpFileStdoutName)
         except OSError:
             pass
@@ -176,7 +182,7 @@ def piped_spawn(sh, escape, cmd, args, env, stdout, stderr):
         try:
             with open(tmpFileStderrName, "rb") as tmpFileStderr:
                 errors = tmpFileStderr.read()
-                stderr.write(errors.decode(stderr.encoding if stderr.encoding is not None else 'utf-8', "replace"))
+                stderr.write(errors.decode(stderr.encoding, "replace"))
             os.remove(tmpFileStderrName)
         except OSError:
             pass