Revert "fix(shell): decode Windows pipe output with system codepage instead of UTF-8"

This reverts commit 3db6d1c.

Author: markuslf

CHANGELOG.md

@@ -45,7 +45,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-* shell.py: fix `UnicodeDecodeError` on Windows when command output contains non-ASCII characters (e.g. usernames with umlauts) by decoding with the system's ANSI codepage instead of assuming UTF-8
 * base.py: `cu()` now also escapes HTML characters in the error message, not just in the traceback
 * base.py: `cu()` now detects active exceptions via `sys.exc_info()` instead of string-matching the traceback
 * base.py: `get_state()` no longer calls `sys.exit()` on malformed range specs, returns UNKNOWN instead

shell.py

@@ -12,10 +12,9 @@
 """
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2026040801'
+__version__ = '2026032101'
 
 
-import locale
 import os
 import re
 import shlex
@@ -144,19 +143,9 @@ def shell_exec(cmd, env=None, shell=False, stdin='', cwd=None, timeout=None, lc_
     env = {**os.environ.copy(), **(env or {})}
     env['LC_ALL'] = lc_all
 
-    # On Windows, subprocess pipes deliver output in the system's ANSI codepage
-    # (e.g. CP1252, CP437), NOT in UTF-8, even if "chcp 65001" was run beforehand.
-    # This is because pipes are not console devices (see PEP 528 and Python docs
-    # on sys.stdout). We therefore decode with the system's preferred encoding
-    # and fall back to 'replace' to avoid UnicodeDecodeError on unexpected bytes.
-    # See: https://github.com/Linuxfabrik/monitoring-plugins/issues/681
     if os.name == 'nt':
-        _encoding = locale.getpreferredencoding(False)
-        _errors = 'replace'
+        cmd = f'chcp 65001 && {cmd}'
         shell = True
-    else:
-        _encoding = 'utf-8'
-        _errors = 'surrogateescape'
 
     if shell or stdin:
         try:
@@ -182,8 +171,8 @@ def shell_exec(cmd, env=None, shell=False, stdin='', cwd=None, timeout=None, lc_
             p.communicate()
             return False, f'Timeout after {timeout} seconds.'
         retc = p.returncode
-        stdout = txt.to_text(stdout, encoding=_encoding, errors=_errors)
-        stderr = txt.to_text(stderr, encoding=_encoding, errors=_errors)
+        stdout = txt.to_text(stdout).replace('Active code page: 65001\r\n', '')
+        stderr = txt.to_text(stderr)
         return True, (stdout, stderr, retc)
 
     cmds = cmd.split('|')
@@ -210,8 +199,4 @@ def shell_exec(cmd, env=None, shell=False, stdin='', cwd=None, timeout=None, lc_
         p.communicate()
         return False, f'Timeout after {timeout} seconds.'
 
-    return True, (
-        txt.to_text(stdout, encoding=_encoding, errors=_errors),
-        txt.to_text(stderr, encoding=_encoding, errors=_errors),
-        p.returncode,
-    )
+    return True, (txt.to_text(stdout), txt.to_text(stderr), p.returncode)