floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10955 from pytest-dev/backport-10954-to-7.3.x 

[7.3.x] Fix couple of EncodingWarnings
This commit is contained in:
Ran Benita 2023-04-29 12:01:57 +03:00 committed by GitHub
parent c403dc538b 2ae187e78d
commit 384d54e11f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/_py/path.py
View File

@ -953,7 +953,7 @@ class LocalPath:
else: else:
p.dirpath()._ensuredirs() p.dirpath()._ensuredirs()
if not p.check(file=1): if not p.check(file=1):
p.open("w").close() p.open("wb").close()
return p return p
@overload @overload

4
src/_pytest/faulthandler.py
View File

@ -27,7 +27,9 @@ def pytest_configure(config: Config) -> None:
import faulthandler import faulthandler
stderr_fd_copy = os.dup(get_stderr_fileno()) stderr_fd_copy = os.dup(get_stderr_fileno())
config.stash[fault_handler_stderr_key] = open(stderr_fd_copy, "w") config.stash[fault_handler_stderr_key] = open(
stderr_fd_copy, "w", encoding=sys.stderr.encoding
)
config.stash[fault_handler_originally_enabled_key] = faulthandler.is_enabled() config.stash[fault_handler_originally_enabled_key] = faulthandler.is_enabled()
faulthandler.enable(file=config.stash[fault_handler_stderr_key]) faulthandler.enable(file=config.stash[fault_handler_stderr_key])