Apply pyupgrade autofixes

Author: Avasam

pyproject.toml

@@ -32,11 +32,15 @@ select = [
     "FA", # flake8-future-annotations
     "I", # isort
     "PYI", # flake8-pyi
+    "UP", # pyupgrade
 ]
 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)`
+
     # Typeshed doesn't want complex or non-literal defaults, or long strings, for maintenance and testing reasons.
     # This doesn't affect us, let's have more complete stubs.
     "PYI011",

stubs/matplotlib/__init__.pyi

@@ -1,5 +1,6 @@
 import contextlib
-from typing import Generator, Literal
+from collections.abc import Generator
+from typing import Literal
 
 import numpy as np
 from packaging.version import parse as parse_version

stubs/matplotlib/_api/__init__.pyi

@@ -1,5 +1,6 @@
 import functools
-from typing import Any, Callable, Generator, Iterable, Type
+from collections.abc import Generator, Iterable
+from typing import Callable
 
 from .deprecation import MatplotlibDeprecationWarning
 
@@ -19,5 +20,5 @@ def select_matching_signature(funcs: list[Callable], *args, **kwargs): ...
 def recursive_subclasses(cls) -> Generator: ...
 def warn_external(
     message: MatplotlibDeprecationWarning | PendingDeprecationWarning | str,
-    category: None | Type[MatplotlibDeprecationWarning] = ...,
+    category: None | type[MatplotlibDeprecationWarning] = ...,
 ) -> None: ...

stubs/matplotlib/_api/deprecation.pyi

@@ -1,6 +1,7 @@
 import contextlib
+from collections.abc import Iterator
 from functools import partial
-from typing import Callable, Iterator
+from typing import Callable
 
 class MatplotlibDeprecationWarning(DeprecationWarning): ...
 

stubs/matplotlib/_mathtext.pyi

@@ -64,7 +64,7 @@ class DejaVuSansFonts(DejaVuFonts): ...
 
 class StixFonts(UnicodeFonts):
     def __init__(self, *args, **kwargs) -> None: ...
-    @functools.lru_cache()
+    @functools.lru_cache
     def get_sized_alternatives_for_symbol(self, fontname, sym) -> list[tuple]: ...
 
 class StixSansFonts(StixFonts): ...

stubs/matplotlib/_pylab_helpers.pyi

@@ -1,4 +1,4 @@
-from typing import Any, List, OrderedDict
+from collections import OrderedDict
 
 from .backend_bases import FigureManagerBase
 from .figure import Figure

stubs/matplotlib/_text_helpers.pyi

@@ -1,4 +1,4 @@
-from typing import Generator
+from collections.abc import Generator
 
 LayoutItem = ...
 

stubs/matplotlib/_tight_layout.pyi

@@ -1,4 +1,4 @@
-from typing import Sequence
+from collections.abc import Sequence
 
 from .axes import Axes, SubplotBase
 from .backend_bases import RendererBase

stubs/matplotlib/afm.pyi

@@ -1,11 +1,11 @@
 # COMPLETE
 
-from typing import BinaryIO, List, Literal, NamedTuple, Optional, Tuple, Union, overload
+from typing import BinaryIO, Literal, NamedTuple, overload
 
 class CharMetrics(NamedTuple):
     width: float
     name: str
-    bbox: List[int]
+    bbox: list[int]
 
 class CompositePart(NamedTuple):
     name: str
@@ -20,11 +20,11 @@ class AFM:
     def family_name(self) -> str: ...
     def get_angle(self) -> float: ...
     @overload
-    def get_bbox_char(self, c: str, isord: Literal[False] = ...) -> List[int]: ...
+    def get_bbox_char(self, c: str, isord: Literal[False] = ...) -> list[int]: ...
     @overload
-    def get_bbox_char(self, c: int, isord: Literal[True] = ...) -> List[int]: ...
+    def get_bbox_char(self, c: int, isord: Literal[True] = ...) -> list[int]: ...
     @overload
-    def get_bbox_char(self, c: Union[str, int], isord: bool = ...) -> List[int]: ...
+    def get_bbox_char(self, c: str | int, isord: bool = ...) -> list[int]: ...
     def get_capheight(self) -> float: ...
     def get_familyname(self) -> str: ...
     def get_fontname(self) -> str: ...
@@ -34,27 +34,27 @@ class AFM:
     @overload
     def get_height_char(self, c: int, isord: Literal[True] = ...) -> int: ...
     @overload
-    def get_height_char(self, c: Union[str, int], isord: bool = ...) -> int: ...
+    def get_height_char(self, c: str | int, isord: bool = ...) -> int: ...
     def get_horizontal_stem_width(self) -> float: ...
-    def get_kern_dist(self, c1: Union[str, int], c2: Union[str, int]) -> float: ...
+    def get_kern_dist(self, c1: str | int, c2: str | int) -> float: ...
     def get_kern_dist_from_name(self, name1: str, name2: str) -> float: ...
     @overload
     def get_name_char(self, c: str, isord: Literal[False] = ...) -> str: ...
     @overload
     def get_name_char(self, c: int, isord: Literal[True] = ...) -> str: ...
     @overload
-    def get_name_char(self, c: Union[str, int], isord: bool = ...) -> str: ...
-    def get_str_bbox(self, s: Union[str, bytes]) -> Tuple[float, float, float, float, float]: ...
-    def get_str_bbox_and_descent(self, s: Union[str, bytes]) -> Tuple[float, float, float, float, float]: ...
+    def get_name_char(self, c: str | int, isord: bool = ...) -> str: ...
+    def get_str_bbox(self, s: str | bytes) -> tuple[float, float, float, float, float]: ...
+    def get_str_bbox_and_descent(self, s: str | bytes) -> tuple[float, float, float, float, float]: ...
     def get_underline_thickness(self) -> float: ...
-    def get_vertical_stem_width(self) -> Optional[float]: ...
+    def get_vertical_stem_width(self) -> float | None: ...
     def get_weight(self) -> str: ...
     @overload
     def get_width_char(self, c: str, isord: Literal[False] = ...) -> float: ...
     @overload
     def get_width_char(self, c: int, isord: Literal[True] = ...) -> float: ...
     @overload
-    def get_width_char(self, c: Union[str, int], isord: bool = ...) -> float: ...
+    def get_width_char(self, c: str | int, isord: bool = ...) -> float: ...
     def get_width_from_char_name(self, name: str) -> float: ...
     def get_xheight(self) -> float: ...
-    def string_width_height(self, s: str) -> Tuple[float, float]: ...
+    def string_width_height(self, s: str) -> tuple[float, float]: ...

stubs/matplotlib/animation.pyi

@@ -1,7 +1,8 @@
 import abc
 import contextlib
+from collections.abc import Generator, Iterable, Iterator
 from itertools import count
-from typing import Callable, Generator, Iterable, Iterator, List
+from typing import Callable
 
 from matplotlib.backend_bases import NonGuiException