py39+

asottile · Oct 12, 2024 · 9827b4d · 9827b4d
1 parent 28b9414
commit 9827b4d
Show file tree

Hide file tree

Showing 45 changed files with 59 additions and 63 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
     rev: v3.13.0
     hooks:
     -   id: reorder-python-imports
-        args: [--py38-plus, --add-import, 'from __future__ import annotations']
+        args: [--py39-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/asottile/add-trailing-comma
     rev: v3.1.0
     hooks:
@@ -26,7 +26,7 @@ repos:
     rev: v3.18.0
     hooks:
     -   id: pyupgrade
-        args: [--py38-plus]
+        args: [--py39-plus]
 -   repo: https://github.com/hhatto/autopep8
     rev: v2.3.1
     hooks:

diff --git a/pyupgrade/_ast_helpers.py b/pyupgrade/_ast_helpers.py
@@ -2,7 +2,7 @@
 
 import ast
 import warnings
-from typing import Container
+from collections.abc import Container
 
 from tokenize_rt import Offset
 

diff --git a/pyupgrade/_data.py b/pyupgrade/_data.py
@@ -3,20 +3,18 @@
 import ast
 import collections
 import pkgutil
+from collections.abc import Iterable
 from typing import Callable
-from typing import Iterable
-from typing import List
 from typing import NamedTuple
 from typing import Protocol
-from typing import Tuple
 from typing import TypeVar
 
 from tokenize_rt import Offset
 from tokenize_rt import Token
 
 from pyupgrade import _plugins
 
-Version = Tuple[int, ...]
+Version = tuple[int, ...]
 
 
 class Settings(NamedTuple):
@@ -33,8 +31,8 @@ class State(NamedTuple):
 
 
 AST_T = TypeVar('AST_T', bound=ast.AST)
-TokenFunc = Callable[[int, List[Token]], None]
-ASTFunc = Callable[[State, AST_T, ast.AST], Iterable[Tuple[Offset, TokenFunc]]]
+TokenFunc = Callable[[int, list[Token]], None]
+ASTFunc = Callable[[State, AST_T, ast.AST], Iterable[tuple[Offset, TokenFunc]]]
 
 RECORD_FROM_IMPORTS = frozenset((
     '__future__',

diff --git a/pyupgrade/_main.py b/pyupgrade/_main.py
@@ -5,8 +5,8 @@
 import re
 import sys
 import tokenize
-from typing import Match
-from typing import Sequence
+from collections.abc import Sequence
+from re import Match
 
 from tokenize_rt import NON_CODING_TOKENS
 from tokenize_rt import parse_string_literal

diff --git a/pyupgrade/_plugins/collections_abc.py b/pyupgrade/_plugins/collections_abc.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 

diff --git a/pyupgrade/_plugins/constant_fold.py b/pyupgrade/_plugins/constant_fold.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ast
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 

diff --git a/pyupgrade/_plugins/datetime_utc_alias.py b/pyupgrade/_plugins/datetime_utc_alias.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 

diff --git a/pyupgrade/_plugins/defauldict_lambda.py b/pyupgrade/_plugins/defauldict_lambda.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/default_encoding.py b/pyupgrade/_plugins/default_encoding.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ast
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/dict_literals.py b/pyupgrade/_plugins/dict_literals.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/exceptions.py b/pyupgrade/_plugins/exceptions.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 from typing import NamedTuple
 
 from tokenize_rt import Offset

diff --git a/pyupgrade/_plugins/format_locals.py b/pyupgrade/_plugins/format_locals.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ast
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import rfind_string_parts

diff --git a/pyupgrade/_plugins/fstrings.py b/pyupgrade/_plugins/fstrings.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ast
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import parse_string_literal

diff --git a/pyupgrade/_plugins/identity_equality.py b/pyupgrade/_plugins/identity_equality.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/imports.py b/pyupgrade/_plugins/imports.py
@@ -4,8 +4,8 @@
 import bisect
 import collections
 import functools
-from typing import Iterable
-from typing import Mapping
+from collections.abc import Iterable
+from collections.abc import Mapping
 from typing import NamedTuple
 
 from tokenize_rt import Offset
@@ -298,7 +298,7 @@
 # END GENERATED
 
 
-@functools.lru_cache(maxsize=None)
+@functools.cache
 def _for_version(
         version: tuple[int, ...],
         *,

diff --git a/pyupgrade/_plugins/io_open.py b/pyupgrade/_plugins/io_open.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ast
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/legacy.py b/pyupgrade/_plugins/legacy.py
@@ -4,9 +4,9 @@
 import collections
 import contextlib
 import functools
+from collections.abc import Generator
+from collections.abc import Iterable
 from typing import Any
-from typing import Generator
-from typing import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/lru_cache.py b/pyupgrade/_plugins/lru_cache.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/metaclass_type.py b/pyupgrade/_plugins/metaclass_type.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ast
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/mock.py b/pyupgrade/_plugins/mock.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ast
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/native_literals.py b/pyupgrade/_plugins/native_literals.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/new_style_classes.py b/pyupgrade/_plugins/new_style_classes.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ast
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 

diff --git a/pyupgrade/_plugins/open_mode.py b/pyupgrade/_plugins/open_mode.py
@@ -3,7 +3,7 @@
 import ast
 import functools
 import itertools
-from typing import Iterable
+from collections.abc import Iterable
 from typing import NamedTuple
 
 from tokenize_rt import Offset

diff --git a/pyupgrade/_plugins/percent_format.py b/pyupgrade/_plugins/percent_format.py
@@ -3,12 +3,11 @@
 import ast
 import functools
 import re
-from typing import Generator
-from typing import Iterable
-from typing import Match
+from collections.abc import Generator
+from collections.abc import Iterable
+from re import Match
+from re import Pattern
 from typing import Optional
-from typing import Pattern
-from typing import Tuple
 
 from tokenize_rt import Offset
 from tokenize_rt import Token
@@ -23,14 +22,14 @@
 from pyupgrade._token_helpers import remove_brace
 from pyupgrade._token_helpers import victims
 
-PercentFormatPart = Tuple[
+PercentFormatPart = tuple[
     Optional[str],
     Optional[str],
     Optional[str],
     Optional[str],
     str,
 ]
-PercentFormat = Tuple[str, Optional[PercentFormatPart]]
+PercentFormat = tuple[str, Optional[PercentFormatPart]]
 
 MAPPING_KEY_RE = re.compile(r'\(([^()]*)\)')
 CONVERSION_FLAG_RE = re.compile('[#0+ -]*')

diff --git a/pyupgrade/_plugins/set_literals.py b/pyupgrade/_plugins/set_literals.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/shlex_join.py b/pyupgrade/_plugins/shlex_join.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import NON_CODING_TOKENS
 from tokenize_rt import Offset

diff --git a/pyupgrade/_plugins/six_base_classes.py b/pyupgrade/_plugins/six_base_classes.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ast
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 

diff --git a/pyupgrade/_plugins/six_calls.py b/pyupgrade/_plugins/six_calls.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/six_metaclasses.py b/pyupgrade/_plugins/six_metaclasses.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ast
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import NON_CODING_TOKENS
 from tokenize_rt import Offset

diff --git a/pyupgrade/_plugins/six_remove_decorators.py b/pyupgrade/_plugins/six_remove_decorators.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ast
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 

diff --git a/pyupgrade/_plugins/six_simple.py b/pyupgrade/_plugins/six_simple.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 

diff --git a/pyupgrade/_plugins/subprocess_run.py b/pyupgrade/_plugins/subprocess_run.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/type_of_primitive.py b/pyupgrade/_plugins/type_of_primitive.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/typing_classes.py b/pyupgrade/_plugins/typing_classes.py
@@ -2,7 +2,7 @@
 
 import ast
 import functools
-from typing import Iterable
+from collections.abc import Iterable
 
 from tokenize_rt import Offset
 from tokenize_rt import Token

diff --git a/pyupgrade/_plugins/typing_pep563.py b/pyupgrade/_plugins/typing_pep563.py
@@ -3,8 +3,8 @@
 import ast
 import functools
 import sys
-from typing import Iterable
-from typing import Sequence
+from collections.abc import Iterable
+from collections.abc import Sequence
 
 from tokenize_rt import Offset