[ruff] Add 'consider-using-in' from pylint

See https://pylint.readthedocs.io/en/latest/user_guide/messages/refactor/consider-using-in.html
An automated fix from ruff is available (but it's unsafe for now).
This commit is contained in:
Pierre Sassoulas 2024-02-10 15:46:45 +01:00
parent 7690a0ddf1
commit 1180348303
6 changed files with 6 additions and 5 deletions

View File

@ -104,6 +104,7 @@ select = [
"W", # pycodestyle "W", # pycodestyle
"PIE", # flake8-pie "PIE", # flake8-pie
"PGH004", # pygrep-hooks - Use specific rule codes when using noqa "PGH004", # pygrep-hooks - Use specific rule codes when using noqa
"PLR1714", # Consider merging multiple comparisons
] ]
ignore = [ ignore = [
# bugbear ignore # bugbear ignore

View File

@ -289,7 +289,7 @@ def get_user_id() -> int | None:
# mypy follows the version and platform checking expectation of PEP 484: # mypy follows the version and platform checking expectation of PEP 484:
# https://mypy.readthedocs.io/en/stable/common_issues.html?highlight=platform#python-version-and-system-platform-checks # https://mypy.readthedocs.io/en/stable/common_issues.html?highlight=platform#python-version-and-system-platform-checks
# Containment checks are too complex for mypy v1.5.0 and cause failure. # Containment checks are too complex for mypy v1.5.0 and cause failure.
if sys.platform == "win32" or sys.platform == "emscripten": if sys.platform in {"win32", "emscripten"}:
# win32 does not have a getuid() function. # win32 does not have a getuid() function.
# Emscripten has a return 0 stub. # Emscripten has a return 0 stub.
return None return None

View File

@ -624,7 +624,7 @@ class LogXML:
def update_testcase_duration(self, report: TestReport) -> None: def update_testcase_duration(self, report: TestReport) -> None:
"""Accumulate total duration for nodeid from given report and update """Accumulate total duration for nodeid from given report and update
the Junit.testcase with the new total if already created.""" the Junit.testcase with the new total if already created."""
if self.report_duration == "total" or report.when == self.report_duration: if self.report_duration in {"total", report.when}:
reporter = self.node_reporter(report) reporter = self.node_reporter(report)
reporter.duration += getattr(report, "duration", 0.0) reporter.duration += getattr(report, "duration", 0.0)

View File

@ -1787,7 +1787,7 @@ class Function(PyobjMixin, nodes.Item):
ntraceback = Traceback( ntraceback = Traceback(
( (
entry entry
if i == 0 or i == len(ntraceback) - 1 if i in {0, len(ntraceback) - 1}
else entry.with_repr_style("short") else entry.with_repr_style("short")
) )
for i, entry in enumerate(ntraceback) for i, entry in enumerate(ntraceback)

View File

@ -381,7 +381,7 @@ class TerminalReporter:
if self.config.getoption("setupshow", False): if self.config.getoption("setupshow", False):
return False return False
cfg: str = self.config.getini("console_output_style") cfg: str = self.config.getini("console_output_style")
if cfg == "progress" or cfg == "progress-even-when-capture-no": if cfg in {"progress", "progress-even-when-capture-no"}:
return "progress" return "progress"
elif cfg == "count": elif cfg == "count":
return "count" return "count"

View File

@ -429,7 +429,7 @@ class TestAssertionRewrite:
def f2() -> None: def f2() -> None:
x = 1 x = 1
assert x == 1 or x == 2 assert x == 1 or x == 2 # noqa: PLR1714
getmsg(f2, must_pass=True) getmsg(f2, must_pass=True)