diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7caa4439c..fd909dd5d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -32,7 +32,7 @@ repos: - id: reorder-python-imports args: ['--application-directories=.:src', --py3-plus] - repo: https://github.com/asottile/pyupgrade - rev: v1.18.0 + rev: v2.2.1 hooks: - id: pyupgrade args: [--py3-plus] diff --git a/src/_pytest/capture.py b/src/_pytest/capture.py index 7096f95b2..2798a24b4 100644 --- a/src/_pytest/capture.py +++ b/src/_pytest/capture.py @@ -505,7 +505,7 @@ class FDCaptureBinary: self.done = self._done if targetfd == 0: assert not tmpfile, "cannot set tmpfile with stdin" - tmpfile = open(os.devnull, "r") + tmpfile = open(os.devnull) self.syscapture = SysCapture(targetfd) else: if tmpfile is None: @@ -580,7 +580,7 @@ class FDCapture(FDCaptureBinary): """ # Ignore type because it doesn't match the type in the superclass (bytes). - EMPTY_BUFFER = str() # type: ignore + EMPTY_BUFFER = "" # type: ignore def snap(self): self.tmpfile.seek(0) @@ -651,7 +651,7 @@ class SysCaptureBinary: class SysCapture(SysCaptureBinary): - EMPTY_BUFFER = str() # type: ignore[assignment] # noqa: F821 + EMPTY_BUFFER = "" # type: ignore[assignment] # noqa: F821 def snap(self): res = self.tmpfile.getvalue() diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py index 5fe8c21ff..9fcda8f0b 100644 --- a/src/_pytest/pytester.py +++ b/src/_pytest/pytester.py @@ -1202,8 +1202,8 @@ class Testdir: finally: f1.close() f2.close() - f1 = open(str(p1), "r", encoding="utf8") - f2 = open(str(p2), "r", encoding="utf8") + f1 = open(str(p1), encoding="utf8") + f2 = open(str(p2), encoding="utf8") try: out = f1.read().splitlines() err = f2.read().splitlines() diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index fd330f670..36a24a38a 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -1339,7 +1339,7 @@ def test_tee_stdio_captures_and_live_prints(testdir): result.stderr.fnmatch_lines(["*@this is stderr@*"]) # now ensure the output is in the junitxml - with open(os.path.join(testdir.tmpdir.strpath, "output.xml"), "r") as f: + with open(os.path.join(testdir.tmpdir.strpath, "output.xml")) as f: fullXml = f.read() assert "@this is stdout@\n" in fullXml assert "@this is stderr@\n" in fullXml diff --git a/testing/logging/test_reporting.py b/testing/logging/test_reporting.py index 4333bbb00..ad7af9370 100644 --- a/testing/logging/test_reporting.py +++ b/testing/logging/test_reporting.py @@ -1103,11 +1103,11 @@ def test_log_set_path(testdir): """ ) testdir.runpytest() - with open(os.path.join(report_dir_base, "test_first"), "r") as rfh: + with open(os.path.join(report_dir_base, "test_first")) as rfh: content = rfh.read() assert "message from test 1" in content - with open(os.path.join(report_dir_base, "test_second"), "r") as rfh: + with open(os.path.join(report_dir_base, "test_second")) as rfh: content = rfh.read() assert "message from test 2" in content diff --git a/testing/test_capture.py b/testing/test_capture.py index 132ce1cc6..b059073b5 100644 --- a/testing/test_capture.py +++ b/testing/test_capture.py @@ -1401,14 +1401,14 @@ def test_global_capture_with_live_logging(testdir): result = testdir.runpytest_subprocess("--log-cli-level=INFO") assert result.ret == 0 - with open("caplog", "r") as f: + with open("caplog") as f: caplog = f.read() assert "fix setup" in caplog assert "something in test" in caplog assert "fix teardown" in caplog - with open("capstdout", "r") as f: + with open("capstdout") as f: capstdout = f.read() assert "fix setup" in capstdout