Remove contextlib.suppress usages

Author: Avasam

pyproject.toml

@@ -67,7 +67,6 @@ select = [
     "RSE", # flake8-raise
     "RUF", # Ruff-specific and unused-noqa
     "S", # flake8-bandit
-    "SIM", # flake8-simplify
     "SLOT", # flake8-slots
     "TRY", # tryceratops
     "UP", # pyupgrade
@@ -78,11 +77,6 @@ select = [
     "W", # pycodestyle Warning
     # Only include flake8-annotations rules that are autofixable. Otherwise leave this to mypy+pyright
     "ANN2",
-    # Don't include TC rules that create a TYPE_CHECKING block or stringifies annotations
-    "TC004", # Move import `{qualified_name}` out of type-checking block. Import is used for more than type hinting.
-    "TC005", # Found empty type-checking block
-    # "TC008", # TODO: Enable when out of preview
-    "TC010", # Invalid string member in `X | Y`-style union type
     # Most refurb rules are in preview and can be opinionated,
     # consider them individually as they come out of preview (last check: 0.8.4)
     "FURB105", # Unnecessary empty string passed to `print`
@@ -117,6 +111,26 @@ select = [
     # "PYI061", # TODO: Enable when out of preview
     "PYI062", # Duplicate literal member `{}`
     "PYI064", # `Final[Literal[{literal}]]` can be replaced with a bare Final
+    # flake8-simplify, excluding rules that can reduce performance or readability due to long line formatting
+    "SIM101", # Multiple `isinstance` calls for `{name}`, merge into a single call
+    "SIM103", # Return the condition `{condition}` directly
+    "SIM107", # Don't use return in `try-except` and `finally`
+    "SIM109", # Use `{replacement}` instead of multiple equality comparisons
+    "SIM112", # Use capitalized environment variable `{expected}` instead of `{actual}`
+    "SIM113", # Use `enumerate()` for index variable `{index}` in `for` loop
+    "SIM114", # Combine `if` branches using logical `or` operator
+    "SIM115", # Use a context manager for opening files
+    "SIM118", # Use key `{operator}` dict instead of key `{operator} dict.keys()`
+    "SIM2", # flake8-simplify conditional ordering rules
+    "SIM300", # Yoda condition detected
+    "SIM401", # Use `{contents}` instead of an if block
+    "SIM910", # Use `{expected}` instead of `{actual}` (dict-get-with-none-default)
+    "SIM911", # Use `{expected}` instead of `{actual}` (zip-dict-keys-and-values)
+    # Don't include TC rules that create a TYPE_CHECKING block or stringifies annotations
+    "TC004", # Move import `{qualified_name}` out of type-checking block. Import is used for more than type hinting.
+    "TC005", # Found empty type-checking block
+    # "TC008", # TODO: Enable when out of preview
+    "TC010", # Invalid string member in `X | Y`-style union type
 ]
 extend-safe-fixes = [
     "UP036", # Remove unnecessary `sys.version_info` blocks

scripts/stubsabot.py

@@ -3,7 +3,6 @@
 
 import argparse
 import asyncio
-import contextlib
 import datetime
 import enum
 import functools
@@ -334,8 +333,10 @@ async def get_diff_info(
         # Some packages in typeshed have tag names
         # that are invalid to be passed to the Version() constructor,
         # e.g. v.1.4.2
-        with contextlib.suppress(packaging.version.InvalidVersion):
+        try:
             versions_to_tags[packaging.version.Version(tag_name)] = tag_name
+        except packaging.version.InvalidVersion:
+            pass
 
     try:
         new_tag = versions_to_tags[pypi_version]

tests/stubtest_third_party.py

@@ -4,7 +4,6 @@
 from __future__ import annotations
 
 import argparse
-import contextlib
 import os
 import re
 import subprocess
@@ -406,5 +405,7 @@ def main() -> NoReturn:
 
 
 if __name__ == "__main__":
-    with contextlib.suppress(KeyboardInterrupt):
+    try:
         main()
+    except KeyboardInterrupt:
+        pass