p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11648 from bluetech/fix-locale-encoding 

pytester: avoid EncodingWarning from `locale.getpreferredencoding`
This commit is contained in:
Ran Benita 2023-11-28 18:12:28 +02:00 committed by GitHub
parent 172bf89ad1 ad1bccdead
commit 5782aab017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/_pytest/pytester.py
View File

@ -121,13 +121,18 @@ def pytest_configure(config: Config) -> None:
class LsofFdLeakChecker: class LsofFdLeakChecker:
def get_open_files(self) -> List[Tuple[str, str]]: def get_open_files(self) -> List[Tuple[str, str]]:
if sys.version_info >= (3, 11):
# New in Python 3.11, ignores utf-8 mode
encoding = locale.getencoding()
else:
encoding = locale.getpreferredencoding(False)
out = subprocess.run( out = subprocess.run(
("lsof", "-Ffn0", "-p", str(os.getpid())), ("lsof", "-Ffn0", "-p", str(os.getpid())),
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
check=True, check=True,
text=True, text=True,
encoding=locale.getpreferredencoding(False), encoding=encoding,
).stdout ).stdout
def isopen(line: str) -> bool: def isopen(line: str) -> bool:

6
testing/test_parseopt.py
View File

@ -290,10 +290,10 @@ class TestParser:
def test_argcomplete(pytester: Pytester, monkeypatch: MonkeyPatch) -> None: def test_argcomplete(pytester: Pytester, monkeypatch: MonkeyPatch) -> None:
try: if sys.version_info >= (3, 11):
# New in Python 3.11, ignores utf-8 mode # New in Python 3.11, ignores utf-8 mode
encoding = locale.getencoding() # type: ignore[attr-defined] encoding = locale.getencoding()
except AttributeError: else:
encoding = locale.getpreferredencoding(False) encoding = locale.getpreferredencoding(False)
try: try:
bash_version = subprocess.run( bash_version = subprocess.run(