From 7e510769b4a9b67ef3802a894b36e7978fa222f8 Mon Sep 17 00:00:00 2001
From: Zac Hatfield-Dodds <zac.hatfield.dodds@gmail.com>
Date: Tue, 20 Jun 2023 04:55:39 -0700
Subject: [PATCH] Encoding for subprocess.run

---
 src/_pytest/pytester.py  | 2 ++
 testing/test_parseopt.py | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
index a9299944de..3df52ebe88 100644
--- a/src/_pytest/pytester.py
+++ b/src/_pytest/pytester.py
@@ -6,6 +6,7 @@
 import contextlib
 import gc
 import importlib
+import locale
 import os
 import platform
 import re
@@ -129,6 +130,7 @@ def get_open_files(self) -> List[Tuple[str, str]]:
             stderr=subprocess.DEVNULL,
             check=True,
             text=True,
+            encoding=locale.getpreferredencoding(False),
         ).stdout
 
         def isopen(line: str) -> bool:
diff --git a/testing/test_parseopt.py b/testing/test_parseopt.py
index 992f49bc53..c051ec3383 100644
--- a/testing/test_parseopt.py
+++ b/testing/test_parseopt.py
@@ -1,4 +1,5 @@
 import argparse
+import locale
 import os
 import shlex
 import subprocess
@@ -289,6 +290,10 @@ def test_multiple_metavar_help(self, parser: parseopt.Parser) -> None:
 
 
 def test_argcomplete(pytester: Pytester, monkeypatch: MonkeyPatch) -> None:
+    try:
+        encoding = locale.getencoding()  # New in Python 3.11, ignores utf-8 mode
+    except AttributeError:
+        encoding = locale.getpreferredencoding(False)
     try:
         bash_version = subprocess.run(
             ["bash", "--version"],
@@ -296,6 +301,7 @@ def test_argcomplete(pytester: Pytester, monkeypatch: MonkeyPatch) -> None:
             stderr=subprocess.DEVNULL,
             check=True,
             text=True,
+            encoding=encoding,
         ).stdout
     except (OSError, subprocess.CalledProcessError):
         pytest.skip("bash is not available")