ruff: Enable UP rules

Signed-off-by: Stephen Finucane <stephen@that.guru>

Author: stephenfin

fixtures/_fixtures/environ.py

@@ -19,7 +19,6 @@
 ]
 
 import os
-from typing import Optional
 
 from fixtures import Fixture
 
@@ -28,9 +27,9 @@ class EnvironmentVariable(Fixture):
     """Isolate a specific environment variable."""
 
     varname: str
-    newvalue: Optional[str]
+    newvalue: str | None
 
-    def __init__(self, varname: str, newvalue: Optional[str] = None) -> None:
+    def __init__(self, varname: str, newvalue: str | None = None) -> None:
         """Create an EnvironmentVariable fixture.
 
         :param varname: the name of the variable to isolate.
@@ -40,7 +39,7 @@ def __init__(self, varname: str, newvalue: Optional[str] = None) -> None:
         During setup the variable will be deleted or assigned the requested
         value, and this will be restored in cleanUp.
         """
-        super(EnvironmentVariable, self).__init__()
+        super().__init__()
         self.varname = varname
         self.newvalue = newvalue
 

fixtures/_fixtures/logger.py

@@ -17,7 +17,7 @@
 
 from logging import StreamHandler, getLogger, INFO, Formatter, Handler, LogRecord
 import sys
-from typing import IO, Optional, Type, TYPE_CHECKING
+from typing import IO, TYPE_CHECKING
 
 from fixtures import Fixture
 from fixtures._fixtures.streams import StringStream
@@ -42,7 +42,7 @@ def __init__(
         self,
         handler: Handler,
         name: str = "",
-        level: Optional[int] = None,
+        level: int | None = None,
         nuke_handlers: bool = True,
     ) -> None:
         """Create a LogHandler fixture.
@@ -54,7 +54,7 @@ def __init__(
         :param nuke_handlers: If True remove all existing handles (prevents
             existing messages going to e.g. stdout). Defaults to True.
         """
-        super(LogHandler, self).__init__()
+        super().__init__()
         self.handler = handler
         self._name = name
         self._level = level
@@ -91,10 +91,10 @@ def __init__(
         self,
         name: str = "",
         level: int = INFO,
-        format: Optional[str] = None,
-        datefmt: Optional[str] = None,
+        format: str | None = None,
+        datefmt: str | None = None,
         nuke_handlers: bool = True,
-        formatter: Optional[Type[Formatter]] = None,
+        formatter: type[Formatter] | None = None,
     ) -> None:
         """Create a FakeLogger fixture.
 
@@ -116,7 +116,7 @@ def test_log(self)
               logging.info('message')
               self.assertEqual('message', fixture.output)
         """
-        super(FakeLogger, self).__init__()
+        super().__init__()
         self._name = name
         self._level = level
         self._format = format
@@ -125,7 +125,7 @@ def test_log(self)
         self._formatter = formatter
 
     def _setUp(self) -> None:
-        name = "pythonlogging:'%s'" % self._name
+        name = f"pythonlogging:'{self._name}'"
         stream_fixture = self.useFixture(StringStream(name))
         output = stream_fixture.stream
         self._output: IO[str] = output

fixtures/_fixtures/mockpatch.py

@@ -16,7 +16,8 @@
 # under the License.
 
 import unittest.mock as mock
-from typing import Any, Callable
+from typing import Any
+from collections.abc import Callable
 
 import fixtures
 
@@ -35,7 +36,7 @@ class MockPatchObject(_Base):
     """Deal with code around mock."""
 
     def __init__(self, obj: Any, attr: str, new: Any = None, **kwargs: Any) -> None:
-        super(MockPatchObject, self).__init__()
+        super().__init__()
         if new is None:
             new = mock.DEFAULT
         self._get_p: Callable[[], Any] = lambda: mock.patch.object(
@@ -47,7 +48,7 @@ class MockPatch(_Base):
     """Deal with code around mock.patch."""
 
     def __init__(self, obj: str, new: Any = None, **kwargs: Any) -> None:
-        super(MockPatch, self).__init__()
+        super().__init__()
         if new is None:
             new = mock.DEFAULT
         self._get_p: Callable[[], Any] = lambda: mock.patch(obj, new, **kwargs)
@@ -91,5 +92,5 @@ def __init__(self, obj: Any, **kwargs: Any) -> None:
         :param kwargs: names and values of attributes of obj to be mocked.
 
         """
-        super(MockPatchMultiple, self).__init__()
+        super().__init__()
         self._get_p: Callable[[], Any] = lambda: mock.patch.multiple(obj, **kwargs)

fixtures/_fixtures/popen.py

@@ -21,7 +21,8 @@
 import random
 import subprocess
 import sys
-from typing import Any, Callable, Dict, IO, List, Optional, Tuple, Union, Final
+from typing import Any, IO, Final
+from collections.abc import Callable
 
 from fixtures import Fixture
 
@@ -35,23 +36,23 @@ class _Unpassed:
 _unpassed: Final = _Unpassed()
 
 
-class FakeProcess(object):
+class FakeProcess:
     """A test double process, roughly meeting subprocess.Popen's contract."""
 
-    def __init__(self, args: Dict[str, Any], info: Dict[str, Any]) -> None:
+    def __init__(self, args: dict[str, Any], info: dict[str, Any]) -> None:
         self._args = args
         self.stdin: Any = info.get("stdin")
         self.stdout: Any = info.get("stdout")
         self.stderr: Any = info.get("stderr")
         self.pid: int = random.randint(0, 65536)
         self._returncode: int = info.get("returncode", 0)
-        self.returncode: Optional[int] = None
+        self.returncode: int | None = None
 
     @property
     def args(self) -> Any:
         return self._args["args"]
 
-    def poll(self) -> Optional[int]:
+    def poll(self) -> int | None:
         """Get the current value of FakeProcess.returncode.
 
         The returncode is None before communicate() and/or wait() are called,
@@ -61,8 +62,8 @@ def poll(self) -> Optional[int]:
         return self.returncode
 
     def communicate(
-        self, input: Optional[Union[bytes, str]] = None, timeout: Optional[float] = None
-    ) -> Tuple[Any, Any]:
+        self, input: bytes | str | None = None, timeout: float | None = None
+    ) -> tuple[Any, Any]:
         self.returncode = self._returncode
         if self.stdin and input:
             self.stdin.write(input)
@@ -86,8 +87,8 @@ def kill(self) -> None:
         pass
 
     def wait(
-        self, timeout: Optional[float] = None, endtime: Optional[float] = None
-    ) -> Optional[int]:
+        self, timeout: float | None = None, endtime: float | None = None
+    ) -> int | None:
         if self.returncode is None:
             self.communicate()
         return self.returncode
@@ -103,7 +104,7 @@ class FakePopen(Fixture):
     """
 
     def __init__(
-        self, get_info: Callable[[Dict[str, Any]], Dict[str, Any]] = lambda _: {}
+        self, get_info: Callable[[dict[str, Any]], dict[str, Any]] = lambda _: {}
     ) -> None:
         """Create a PopenFixture
 
@@ -127,45 +128,45 @@ def get_info(proc_args):
             get_info is not supplied or doesn't return a dict with an explicit
             'returncode' key).
         """
-        super(FakePopen, self).__init__()
+        super().__init__()
         self.get_info = get_info
 
     def _setUp(self) -> None:
         self.addCleanup(setattr, subprocess, "Popen", subprocess.Popen)
         subprocess.Popen = self  # type: ignore[assignment,misc]
-        self.procs: List[FakeProcess] = []
+        self.procs: list[FakeProcess] = []
 
     # The method has the correct signature so we error appropriately if called
     # wrongly.
     def __call__(
         self,
-        args: Union[str, List[str]],
-        bufsize: Union[int, _Unpassed] = _unpassed,
-        executable: Union[str, None, _Unpassed] = _unpassed,
-        stdin: Union[None, int, IO[Any], _Unpassed] = _unpassed,
-        stdout: Union[None, int, IO[Any], _Unpassed] = _unpassed,
-        stderr: Union[None, int, IO[Any], _Unpassed] = _unpassed,
-        preexec_fn: Union[Callable[[], None], None, _Unpassed] = _unpassed,
-        close_fds: Union[bool, _Unpassed] = _unpassed,
-        shell: Union[bool, _Unpassed] = _unpassed,
-        cwd: Union[str, None, _Unpassed] = _unpassed,
-        env: Union[Dict[str, str], None, _Unpassed] = _unpassed,
-        universal_newlines: Union[bool, _Unpassed] = _unpassed,
-        startupinfo: Union[Any, _Unpassed] = _unpassed,
-        creationflags: Union[int, _Unpassed] = _unpassed,
-        restore_signals: Union[bool, _Unpassed] = _unpassed,
-        start_new_session: Union[bool, _Unpassed] = _unpassed,
-        pass_fds: Union[Any, _Unpassed] = _unpassed,
+        args: str | list[str],
+        bufsize: int | _Unpassed = _unpassed,
+        executable: str | None | _Unpassed = _unpassed,
+        stdin: None | int | IO[Any] | _Unpassed = _unpassed,
+        stdout: None | int | IO[Any] | _Unpassed = _unpassed,
+        stderr: None | int | IO[Any] | _Unpassed = _unpassed,
+        preexec_fn: Callable[[], None] | None | _Unpassed = _unpassed,
+        close_fds: bool | _Unpassed = _unpassed,
+        shell: bool | _Unpassed = _unpassed,
+        cwd: str | None | _Unpassed = _unpassed,
+        env: dict[str, str] | None | _Unpassed = _unpassed,
+        universal_newlines: bool | _Unpassed = _unpassed,
+        startupinfo: Any | _Unpassed = _unpassed,
+        creationflags: int | _Unpassed = _unpassed,
+        restore_signals: bool | _Unpassed = _unpassed,
+        start_new_session: bool | _Unpassed = _unpassed,
+        pass_fds: Any | _Unpassed = _unpassed,
         *,
-        group: Union[str, int, None, _Unpassed] = _unpassed,
-        extra_groups: Union[List[Union[str, int]], None, _Unpassed] = _unpassed,
-        user: Union[str, int, None, _Unpassed] = _unpassed,
-        umask: Union[int, None, _Unpassed] = _unpassed,
-        encoding: Union[str, None, _Unpassed] = _unpassed,
-        errors: Union[str, None, _Unpassed] = _unpassed,
-        text: Union[bool, None, _Unpassed] = _unpassed,
-        pipesize: Union[int, _Unpassed] = _unpassed,
-        process_group: Union[int, None, _Unpassed] = _unpassed,
+        group: str | int | None | _Unpassed = _unpassed,
+        extra_groups: list[str | int] | None | _Unpassed = _unpassed,
+        user: str | int | None | _Unpassed = _unpassed,
+        umask: int | None | _Unpassed = _unpassed,
+        encoding: str | None | _Unpassed = _unpassed,
+        errors: str | None | _Unpassed = _unpassed,
+        text: bool | None | _Unpassed = _unpassed,
+        pipesize: int | _Unpassed = _unpassed,
+        process_group: int | None | _Unpassed = _unpassed,
     ) -> FakeProcess:
         if sys.version_info < (3, 11) and not isinstance(process_group, _Unpassed):
             raise TypeError(

fixtures/_fixtures/pythonpackage.py

@@ -18,7 +18,6 @@
 ]
 
 import os.path
-from typing import List, Tuple
 
 from fixtures import Fixture
 from fixtures._fixtures.tempdir import TempDir
@@ -33,7 +32,7 @@ class PythonPackage(Fixture):
     """
 
     def __init__(
-        self, packagename: str, modulelist: List[Tuple[str, bytes]], init: bool = True
+        self, packagename: str, modulelist: list[tuple[str, bytes]], init: bool = True
     ) -> None:
         """Create a PythonPackage.
 

fixtures/_fixtures/streams.py

@@ -20,7 +20,8 @@
 ]
 
 import io
-from typing import Callable, Generic, IO, Tuple, TypeVar, Union
+from typing import Generic, IO, TypeVar
+from collections.abc import Callable
 
 from fixtures import Fixture
 
@@ -39,7 +40,7 @@ class Stream(Generic[T], Fixture):
     def __init__(
         self,
         detail_name: str,
-        stream_factory: Callable[[], Tuple[T, Union[IO[bytes], IO[str]]]],
+        stream_factory: Callable[[], tuple[T, IO[bytes] | IO[str]]],
     ) -> None:
         """Create a ByteStream.
 
@@ -48,7 +49,7 @@ def __init__(
             (write_stream, content_stream).
         """
         self._detail_name = detail_name
-        self._stream_factory: Callable[[], Tuple[T, Union[IO[bytes], IO[str]]]] = (
+        self._stream_factory: Callable[[], tuple[T, IO[bytes] | IO[str]]] = (
             stream_factory
         )
 
@@ -64,7 +65,7 @@ def _setUp(self) -> None:
         )
 
 
-def _byte_stream_factory() -> Tuple[IO[bytes], IO[bytes]]:
+def _byte_stream_factory() -> tuple[IO[bytes], IO[bytes]]:
     result = io.BytesIO()
     return (result, result)
 
@@ -79,7 +80,7 @@ def ByteStream(detail_name: str) -> Stream[IO[bytes]]:
     return Stream(detail_name, _byte_stream_factory)
 
 
-def _string_stream_factory() -> Tuple[IO[str], IO[bytes]]:
+def _string_stream_factory() -> tuple[IO[str], IO[bytes]]:
     lower = io.BytesIO()
     upper = io.TextIOWrapper(lower, encoding="utf8")
     # See http://bugs.python.org/issue7955

fixtures/_fixtures/tempdir.py

@@ -21,7 +21,6 @@
 import os
 import shutil
 import tempfile
-from typing import Optional
 
 import fixtures
 
@@ -33,9 +32,9 @@ class TempDir(fixtures.Fixture):
     """
 
     path: str
-    rootdir: Optional[str]
+    rootdir: str | None
 
-    def __init__(self, rootdir: Optional[str] = None) -> None:
+    def __init__(self, rootdir: str | None = None) -> None:
         """Create a TempDir.
 
         :param rootdir: If supplied force the temporary directory to be a

fixtures/_fixtures/temphomedir.py

@@ -28,5 +28,5 @@ class TempHomeDir(TempDir):
     """
 
     def _setUp(self) -> None:
-        super(TempHomeDir, self)._setUp()
+        super()._setUp()
         self.useFixture(EnvironmentVariable("HOME", self.path))

fixtures/_fixtures/timeout.py

@@ -17,7 +17,8 @@
 """Timeout fixture."""
 
 import signal
-from typing import Any, Callable, Optional
+from typing import Any
+from collections.abc import Callable
 
 import fixtures
 
@@ -44,7 +45,7 @@ class Timeout(fixtures.Fixture):
     """
 
     timeout_secs: int
-    alarm_fn: Optional[Callable[[int], int]]
+    alarm_fn: Callable[[int], int] | None
     gentle: bool
 
     def __init__(self, timeout_secs: int, gentle: bool) -> None: