Enable Ruff SIM

pyproject.toml

@@ -41,6 +41,7 @@ select = [
     "FA", # flake8-future-annotations
     "I", # isort
     "RUF", # Ruff-specific and unused-noqa
+    "SIM", # flake8-simplify
     "UP", # pyupgrade
     # Flake8 base rules
     "E", # pycodestyle Error
@@ -86,11 +87,13 @@ ignore = [
     ###
     # Rules we don't want or don't agree with
     ###
-    # Slower and more verbose https://github.com/astral-sh/ruff/issues/7871
-    "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)`
     # Used for direct, non-subclass type comparison, for example: `type(val) is str`
     # see https://github.com/astral-sh/ruff/issues/6465
     "E721", # Do not compare types, use `isinstance()`
+    # contextlib.suppress is roughly 3x slower than try/except
+    "SIM105", # flake8-simplify: use-contextlib-suppress
+    # Slower and more verbose https://github.com/astral-sh/ruff/issues/7871
+    "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)`
     ###
     # False-positives, but already checked by type-checkers
     ###

scripts/stubsabot.py

@@ -200,10 +200,7 @@ def all_py_files_in_source_are_in_py_typed_dirs(source: zipfile.ZipFile | tarfil
     if not all_python_files:
         return False
 
-    for path in all_python_files:
-        if not any(py_typed_dir in path.parents for py_typed_dir in py_typed_dirs):
-            return False
-    return True
+    return all(any(py_typed_dir in path.parents for py_typed_dir in py_typed_dirs) for path in all_python_files)
 
 
 async def release_contains_py_typed(release_to_download: PypiReleaseDownload, *, session: aiohttp.ClientSession) -> bool:
@@ -747,10 +744,7 @@ async def main() -> None:
     parser.add_argument("distributions", nargs="*", help="Distributions to update, default = all")
     args = parser.parse_args()
 
-    if args.distributions:
-        dists_to_update = args.distributions
-    else:
-        dists_to_update = [path.name for path in STUBS_PATH.iterdir()]
+    dists_to_update = args.distributions if args.distributions else [path.name for path in STUBS_PATH.iterdir()]
 
     if args.action_level > ActionLevel.nothing:
         subprocess.run(["git", "update-index", "--refresh"], capture_output=True)
@@ -765,9 +759,8 @@ async def main() -> None:
             print(f"Cannot run stubsabot, as uncommitted changes are present in {changed_files}!")
             sys.exit(1)
 
-    if args.action_level > ActionLevel.fork:
-        if os.environ.get("GITHUB_TOKEN") is None:
-            raise ValueError("GITHUB_TOKEN environment variable must be set")
+    if args.action_level > ActionLevel.fork and os.environ.get("GITHUB_TOKEN") is None:
+        raise ValueError("GITHUB_TOKEN environment variable must be set")
 
     denylist = {"gdb"}  # gdb is not a pypi distribution
 

stdlib/_ssl.pyi

@@ -240,9 +240,7 @@ OP_SINGLE_ECDH_USE: int
 OP_NO_COMPRESSION: int
 OP_ENABLE_MIDDLEBOX_COMPAT: int
 OP_NO_RENEGOTIATION: int
-if sys.version_info >= (3, 11):
-    OP_IGNORE_UNEXPECTED_EOF: int
-elif sys.version_info >= (3, 8) and sys.platform == "linux":
+if sys.version_info >= (3, 11) or sys.platform == "linux":
     OP_IGNORE_UNEXPECTED_EOF: int
 if sys.version_info >= (3, 12):
     OP_LEGACY_SERVER_CONNECT: int

tests/pytype_test.py

@@ -228,10 +228,7 @@ def run_all_tests(*, files_to_test: Sequence[str], print_stderr: bool, dry_run:
     python_version = f"{sys.version_info.major}.{sys.version_info.minor}"
     print("Testing files with pytype...")
     for i, f in enumerate(files_to_test):
-        if dry_run:
-            stderr = None
-        else:
-            stderr = run_pytype(filename=f, python_version=python_version, missing_modules=missing_modules)
+        stderr = None if dry_run else run_pytype(filename=f, python_version=python_version, missing_modules=missing_modules)
         if stderr:
             if print_stderr:
                 print(f"\n{stderr}")

tests/stubtest_third_party.py

@@ -125,13 +125,11 @@ def run_stubtest(
         stubtest_env = os.environ | {"MYPYPATH": mypypath, "MYPY_FORCE_COLOR": "1"}
 
         # Perform some black magic in order to run stubtest inside uWSGI
-        if dist_name == "uWSGI":
-            if not setup_uwsgi_stubtest_command(dist, venv_dir, stubtest_cmd):
-                return False
+        if dist_name == "uWSGI" and not setup_uwsgi_stubtest_command(dist, venv_dir, stubtest_cmd):
+            return False
 
-        if dist_name == "gdb":
-            if not setup_gdb_stubtest_command(venv_dir, stubtest_cmd):
-                return False
+        if dist_name == "gdb" and not setup_gdb_stubtest_command(venv_dir, stubtest_cmd):
+            return False
 
         try:
             subprocess.run(stubtest_cmd, env=stubtest_env, check=True, capture_output=True)
@@ -390,10 +388,7 @@ def main() -> NoReturn:
     parser.add_argument("dists", metavar="DISTRIBUTION", type=str, nargs=argparse.ZERO_OR_MORE)
     args = parser.parse_args()
 
-    if len(args.dists) == 0:
-        dists = sorted(STUBS_PATH.iterdir())
-    else:
-        dists = [STUBS_PATH / d for d in args.dists]
+    dists = sorted(STUBS_PATH.iterdir()) if len(args.dists) == 0 else [STUBS_PATH / d for d in args.dists]
 
     result = 0
     for i, dist in enumerate(dists):