From be68e22887808fcc42dc316277eb7cc1036abce0 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Wed, 5 Aug 2026 12:11:21 +0300
Subject: [PATCH] Fix argparse test on non-UTF-8 locales like Raspbian

---
 Lib/test/test_argparse.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index ae02cd11804e507..257063609ea7b72 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -7350,6 +7350,9 @@ def test_module_as_main_without_altering_argv(self):
         basename = 'module' + os_helper.FS_NONASCII
         modulename = f'{self.dirname}.{basename}'
         self.make_script(self.dirname, basename)
+        # The filesystem encoding may be non-UTF-8,
+        # but the runner runs in UTF-8 mode
+        modulename = os.fsencode(modulename).decode("utf-8", "surrogateescape")
         runner_source = textwrap.dedent(f'''\
             import runpy
             runpy._run_module_as_main({modulename!r}, alter_argv=False)