- r Use explicit conversion flag

Author: JayBazuzi

approval_utilities/utilities/exceptions/exception_utils.py

@@ -1,2 +1,2 @@
 def to_string(exception: BaseException) -> str:
-    return f"{type(exception).__name__}: {str(exception)}"
+    return f"{type(exception).__name__}: {exception!s}"

approvaltests/combination_approvals.py

@@ -156,7 +156,7 @@ def print_combinations(
 
 
 def args_and_result_formatter(args: list[Any], result: int) -> str:
-    return f"args: {repr(args)} => {repr(result)}\n"
+    return f"args: {args!r} => {result!r}\n"
 
 
 async def print_combinations_async(

approvaltests/reporter_missing_exception.py

@@ -8,4 +8,4 @@ def __init__(self, key: str) -> None:
 
     @override
     def __str__(self) -> str:
-        return f"Could not find {repr(self.value)} in the environment, perhaps you need to configure your reporter."
+        return f"Could not find {self.value!r} in the environment, perhaps you need to configure your reporter."

ruff.toml

@@ -18,7 +18,6 @@ ignore = [
     "COM812",  # Trailing comma missing
     "FURB188",  # Prefer `str.removeprefix()` over conditionally replacing with slice.
     "RET505",  # Unnecessary `...` after `return` statement
-    "RUF010",  # Use explicit conversion flag
     "SIM114",  # Combine `if` branches using logical `or` operator
     "SIM118",  # Use `key not in dict` instead of `key not in dict.keys()`
     "SIM300",  # Yoda condition detected

tests/scrubbers/test_scrubbers.py

@@ -67,7 +67,7 @@ def test_guid() -> None:
 
 def test_combine_scrubbers() -> None:
     verify(
-        f"blah {str(datetime.datetime(year=2000, month=1, day=2))} 2fd78d4a-ad49-447d-96a8-deda585a9aa5",
+        f"blah {datetime.datetime(year=2000, month=1, day=2)!s} 2fd78d4a-ad49-447d-96a8-deda585a9aa5",
         options=Options().with_scrubber(
             combine_scrubbers(
                 scrub_all_guids,

tests/test_scenarios.py

@@ -18,7 +18,7 @@ def is_leap_year(year: int) -> bool:
 @pytest.mark.parametrize("year", [1993, 1992, 1900, 2000])
 def test_scenarios_old(year: int) -> None:
     verify(
-        f"is Leap {str(year)}: {str(is_leap_year(year))}",
+        f"is Leap {year!s}: {is_leap_year(year)!s}",
         namer=get_scenario_namer(year),
     )
 
@@ -27,7 +27,7 @@ def test_scenarios_old(year: int) -> None:
 @pytest.mark.parametrize("year", [1993, 1992, 1900, 2000])
 def test_scenarios(year: int) -> None:
     verify(
-        f"is Leap {str(year)}: {str(is_leap_year(year))}",
+        f"is Leap {year!s}: {is_leap_year(year)!s}",
         options=NamerFactory.with_parameters(year),
     )
 
@@ -39,22 +39,22 @@ def test_manual_scenarios_with_blocking() -> None:
     # begin-snippet: multiple-verifies-with-blocking
     year = 1992
     verify(
-        f"is Leap {str(year)}: {str(is_leap_year(year))}",
+        f"is Leap {year!s}: {is_leap_year(year)!s}",
         options=NamerFactory.with_parameters(year),
     )
     year = 1993
     verify(
-        f"is Leap {str(year)}: {str(is_leap_year(year))}",
+        f"is Leap {year!s}: {is_leap_year(year)!s}",
         options=NamerFactory.with_parameters(year),
     )
     year = 1900
     verify(
-        f"is Leap {str(year)}: {str(is_leap_year(year))}",
+        f"is Leap {year!s}: {is_leap_year(year)!s}",
         options=NamerFactory.with_parameters(year),
     )
     year = 2000
     verify(
-        f"is Leap {str(year)}: {str(is_leap_year(year))}",
+        f"is Leap {year!s}: {is_leap_year(year)!s}",
         options=NamerFactory.with_parameters(year),
     )
     # end-snippet
@@ -66,7 +66,7 @@ def test_manual_scenarios() -> None:
     gather_all_exceptions_and_throw(
         years,
         lambda y: verify(
-            f"is Leap {str(y)}: {str(is_leap_year(y))}",
+            f"is Leap {y!s}: {is_leap_year(y)!s}",
             options=NamerFactory.with_parameters(y),
         ),
     )