fix linting based off ruff's suggestions

Author: Vizonex

benchmarks/becnhmark.py

@@ -99,10 +99,7 @@
 
 
 def benchmark_name(name, ctx, prefix=None, use_prefix=False):
-    if use_prefix:
-        return "%s%s" % (prefix % ctx, name)
-
-    return name
+    return f"{prefix % ctx}{name}" if use_prefix else name
 
 
 def add_impl_option(cmd, args):

benchmarks/istr.py

@@ -33,10 +33,7 @@
 
 
 def benchmark_name(name, ctx, prefix=None, use_prefix=False):
-    if use_prefix:
-        return "%s%s" % (prefix % ctx, name)
-
-    return name
+    return f"{prefix % ctx}{name}" if use_prefix else name
 
 
 def add_impl_option(cmd, args):

multidict/_abc.py

@@ -22,7 +22,7 @@ def keys(self) -> Iterable[istr]: ...
     def __getitem__(self, key: istr, /) -> _V_co: ...
 
 
-MDArg = Union[SupportsKeys[_V], SupportsIKeys[_V], Iterable[tuple[str, _V]], None]
+MDArg = SupportsKeys[_V] | SupportsIKeys[_V] | Iterable[tuple[str, _V]] | None
 
 
 class MultiMapping(Mapping[str, _V_co]):

multidict/_multidict_py.py

@@ -667,7 +667,7 @@ def getall(self, key: str, default: _T | _SENTINEL = sentinel) -> list[_V] | _T:
             return res
         if not res and default is not sentinel:
             return default
-        raise KeyError("Key not found: %r" % key)
+        raise KeyError(f"Key not found: {key!r}")
 
     @overload
     def getone(self, key: str) -> _V: ...
@@ -685,7 +685,7 @@ def getone(self, key: str, default: _T | _SENTINEL = sentinel) -> _V | _T:
                 return e.value
         if default is not sentinel:
             return default
-        raise KeyError("Key not found: %r" % key)
+        raise KeyError(f"Key not found: {key!r}")
 
     # Mapping interface #
 

tests/conftest.py

@@ -6,7 +6,6 @@
 from functools import cached_property
 from importlib import import_module
 from types import ModuleType
-from typing import Type, Union
 from collections.abc import Callable
 
 import pytest

tests/gen_pickles.py

@@ -1,12 +1,11 @@
 import pickle
 from importlib import import_module
 from pathlib import Path
-from typing import Union
 
 from multidict import CIMultiDict, MultiDict, istr
 
 TESTS_DIR = Path(__file__).parent.resolve()
-_MD_Classes = Union[type[MultiDict[int]], type[CIMultiDict[int]]]
+_MD_Classes = type[MultiDict[int]] | type[CIMultiDict[int]]
 
 
 def write(tag: str, cls: _MD_Classes, proto: int) -> None:

tests/test_copy.py

@@ -1,10 +1,9 @@
 import copy
-from typing import Union
 
 from multidict import CIMultiDict, CIMultiDictProxy, MultiDict, MultiDictProxy
 
-_MD_Classes = Union[type[MultiDict[int]], type[CIMultiDict[int]]]
-_MDP_Classes = Union[type[MultiDictProxy[int]], type[CIMultiDictProxy[int]]]
+_MD_Classes = type[MultiDict[int]] | type[CIMultiDict[int]]
+_MDP_Classes = type[MultiDictProxy[int]] | type[CIMultiDictProxy[int]]
 
 
 def test_copy(any_multidict_class: _MD_Classes) -> None:

tests/test_istr.py

@@ -1,6 +1,5 @@
 import gc
 import sys
-from typing import Type
 from collections.abc import Callable
 
 import pytest

tests/test_leaks.py

@@ -28,7 +28,6 @@ def test_leak(script: str) -> None:
 
     subprocess.run(
         [sys.executable, "-u", "-m", "coverage", "run", str(leak_test_script)],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
+        capture_output=True,
         check=True,
     )

tests/test_multidict.py

@@ -741,11 +741,11 @@ def test__repr__(self, cls: type[MultiDict[str]]) -> None:
         d = cls()
         _cls = type(d)
 
-        assert str(d) == "<%s()>" % _cls.__name__
+        assert str(d) == f"<{_cls.__name__}()>"
 
         d = cls([("key", "one"), ("key", "two")])
 
-        assert str(d) == "<%s('key': 'one', 'key': 'two')>" % _cls.__name__
+        assert str(d) == f"<{_cls.__name__}('key': 'one', 'key': 'two')>"
 
     def test__repr___recursive(
         self, any_multidict_class: type[MultiDict[object]]
@@ -756,7 +756,7 @@ def test__repr___recursive(
         d = any_multidict_class()
         d["key"] = d
 
-        assert str(d) == "<%s('key': ...)>" % _cls.__name__
+        assert str(d) == f"<{_cls.__name__}('key': ...)>"
 
     def test_getall(self, cls: type[MultiDict[str]]) -> None:
         d = cls([("key", "value1")], key="value2")
@@ -868,7 +868,7 @@ def test__repr__(self, cls: type[CIMultiDict[str]]) -> None:
         d = cls([("KEY", "value1")], key="value2")
         _cls = type(d)
 
-        expected = "<%s('KEY': 'value1', 'key': 'value2')>" % _cls.__name__
+        expected = f"<{_cls.__name__}('KEY': 'value1', 'key': 'value2')>"
         assert str(d) == expected
 
     def test_items__repr__(self, cls: type[CIMultiDict[str]]) -> None: