Merge pull request #2422 from DanielNoord/random-cleanup

More cleanup

Author: DanielNoord

isort/api.py

@@ -17,11 +17,12 @@
 import contextlib
 import shutil
 import sys
+from collections.abc import Iterator
 from enum import Enum
 from io import StringIO
 from itertools import chain
 from pathlib import Path
-from typing import Any, Iterator, Optional, Set, TextIO, Union, cast
+from typing import Any, Optional, TextIO, Union, cast
 from warnings import warn
 
 from isort import core
@@ -539,7 +540,7 @@ def find_imports_in_stream(
     file_path: Optional[Path] = None,
     unique: Union[bool, ImportKey] = False,
     top_only: bool = False,
-    _seen: Optional[Set[str]] = None,
+    _seen: Optional[set[str]] = None,
     **config_kwargs: Any,
 ) -> Iterator[identify.Import]:
     """Finds and returns all imports within the provided code stream.
@@ -559,7 +560,7 @@ def find_imports_in_stream(
     if not unique:
         yield from identified_imports
 
-    seen: Set[str] = set() if _seen is None else _seen
+    seen: set[str] = set() if _seen is None else _seen
     for identified_import in identified_imports:
         if unique in (True, ImportKey.ALIAS):
             key = identified_import.statement()
@@ -626,7 +627,7 @@ def find_imports_in_paths(
     - ****config_kwargs**: Any config modifications.
     """
     config = _config(config=config, **config_kwargs)
-    seen: Optional[Set[str]] = set() if unique else None
+    seen: Optional[set[str]] = set() if unique else None
     yield from chain(
         *(
             find_imports_in_file(

isort/comments.py

@@ -1,7 +1,7 @@
-from typing import List, Optional, Tuple
+from typing import Optional
 
 
-def parse(line: str) -> Tuple[str, str]:
+def parse(line: str) -> tuple[str, str]:
     """Parses import lines for comments and returns back the
     import statement and the associated comment.
     """
@@ -13,7 +13,7 @@ def parse(line: str) -> Tuple[str, str]:
 
 
 def add_to_line(
-    comments: Optional[List[str]],
+    comments: Optional[list[str]],
     original_string: str = "",
     removed: bool = False,
     comment_prefix: str = "",
@@ -25,7 +25,7 @@ def add_to_line(
     if not comments:
         return original_string
 
-    unique_comments: List[str] = []
+    unique_comments: list[str] = []
     for comment in comments:
         if comment not in unique_comments:
             unique_comments.append(comment)

isort/core.py

@@ -1,7 +1,7 @@
 import textwrap
 from io import StringIO
 from itertools import chain
-from typing import List, TextIO, Union
+from typing import TextIO, Union
 
 import isort.literal
 from isort.settings import DEFAULT_CONFIG, Config
@@ -53,7 +53,7 @@ def process(
     was provided in the input_stream, otherwise `False`.
     """
     line_separator: str = config.line_ending
-    add_imports: List[str] = [format_natural(addition) for addition in config.add_imports]
+    add_imports: list[str] = [format_natural(addition) for addition in config.add_imports]
     import_section: str = ""
     next_import_section: str = ""
     next_cimports: bool = False
@@ -74,8 +74,8 @@ def process(
     made_changes: bool = False
     stripped_line: str = ""
     end_of_file: bool = False
-    verbose_output: List[str] = []
-    lines_before: List[str] = []
+    verbose_output: list[str] = []
+    lines_before: list[str] = []
     is_reexport: bool = False
     reexport_rollback: int = 0
 

isort/deprecated/finders.py

@@ -8,12 +8,14 @@
 import sys
 import sysconfig
 from abc import ABCMeta, abstractmethod
+from collections.abc import Iterable, Iterator, Sequence
 from contextlib import contextmanager
 from fnmatch import fnmatch
 from functools import lru_cache
 from glob import glob
 from pathlib import Path
-from typing import Dict, Iterable, Iterator, List, Optional, Pattern, Sequence, Tuple, Type
+from re import Pattern
+from typing import Optional
 
 from isort import sections
 from isort.settings import KNOWN_SECTION_MAPPING, Config
@@ -76,7 +78,7 @@ class KnownPatternFinder(BaseFinder):
     def __init__(self, config: Config) -> None:
         super().__init__(config)
 
-        self.known_patterns: List[Tuple[Pattern[str], str]] = []
+        self.known_patterns: list[tuple[Pattern[str], str]] = []
         for placement in reversed(config.sections):
             known_placement = KNOWN_SECTION_MAPPING.get(placement, placement).lower()
             config_key = f"known_{known_placement}"
@@ -92,7 +94,7 @@ def __init__(self, config: Config) -> None:
                 regexp = "^" + known_pattern.replace("*", ".*").replace("?", ".?") + "$"
                 self.known_patterns.append((re.compile(regexp), placement))
 
-    def _parse_known_pattern(self, pattern: str) -> List[str]:
+    def _parse_known_pattern(self, pattern: str) -> list[str]:
         """Expand pattern if identified as a directory and return found sub packages"""
         if pattern.endswith(os.path.sep):
             patterns = [
@@ -217,7 +219,7 @@ def _get_files_from_dir(self, path: str) -> Iterator[str]:
         raise NotImplementedError
 
     @staticmethod
-    def _load_mapping() -> Optional[Dict[str, str]]:
+    def _load_mapping() -> Optional[dict[str, str]]:
         """Return list of mappings `package_name -> module_name`
 
         Example:
@@ -228,15 +230,15 @@ def _load_mapping() -> Optional[Dict[str, str]]:
         path = os.path.dirname(inspect.getfile(pipreqs))
         path = os.path.join(path, "mapping")
         with open(path) as f:
-            mappings: Dict[str, str] = {}  # pypi_name: import_name
+            mappings: dict[str, str] = {}  # pypi_name: import_name
             for line in f:
                 import_name, _, pypi_name = line.strip().partition(":")
                 mappings[pypi_name] = import_name
             return mappings
 
-    def _load_names(self) -> List[str]:
+    def _load_names(self) -> list[str]:
         """Return list of thirdparty modules from requirements"""
-        names: List[str] = []
+        names: list[str] = []
         for path in self._get_files():
             names.extend(self._normalize_name(name) for name in self._get_names(path))
         return names
@@ -296,8 +298,8 @@ def _get_files_from_dir(self, path: str) -> Iterator[str]:
 
     @classmethod
     @lru_cache(maxsize=16)
-    def _get_files_from_dir_cached(cls, path: str) -> List[str]:
-        results: List[str] = []
+    def _get_files_from_dir_cached(cls, path: str) -> list[str]:
+        results: list[str] = []
 
         for fname in os.listdir(path):
             if "requirements" not in fname:
@@ -329,8 +331,8 @@ def _get_names(self, path: str) -> Iterator[str]:
 
     @classmethod
     @lru_cache(maxsize=16)
-    def _get_names_cached(cls, path: str) -> List[str]:
-        result: List[str] = []
+    def _get_names_cached(cls, path: str) -> list[str]:
+        result: list[str] = []
 
         with chdir(os.path.dirname(path)):
             requirements = parse_requirements(Path(path))
@@ -345,7 +347,7 @@ def find(self, module_name: str) -> Optional[str]:
 
 
 class FindersManager:
-    _default_finders_classes: Sequence[Type[BaseFinder]] = (
+    _default_finders_classes: Sequence[type[BaseFinder]] = (
         ForcedSeparateFinder,
         LocalFinder,
         KnownPatternFinder,
@@ -355,26 +357,24 @@ class FindersManager:
     )
 
     def __init__(
-        self, config: Config, finder_classes: Optional[Iterable[Type[BaseFinder]]] = None
+        self, config: Config, finder_classes: Optional[Iterable[type[BaseFinder]]] = None
     ) -> None:
         self.verbose: bool = config.verbose
 
         if finder_classes is None:
             finder_classes = self._default_finders_classes
-        finders: List[BaseFinder] = []
+        finders: list[BaseFinder] = []
         for finder_cls in finder_classes:
             try:
                 finders.append(finder_cls(config))
             except Exception as exception:
                 # if one finder fails to instantiate isort can continue using the rest
                 if self.verbose:
                     print(
-                        (
-                            f"{finder_cls.__name__} encountered an error ({exception}) during "
-                            "instantiation and cannot be used"
-                        )
+                        f"{finder_cls.__name__} encountered an error ({exception}) during "
+                        "instantiation and cannot be used"
                     )
-        self.finders: Tuple[BaseFinder, ...] = tuple(finders)
+        self.finders: tuple[BaseFinder, ...] = tuple(finders)
 
     def find(self, module_name: str) -> Optional[str]:
         for finder in self.finders:

isort/exceptions.py

@@ -2,7 +2,7 @@
 
 from functools import partial
 from pathlib import Path
-from typing import Any, Dict, List, Type, Union
+from typing import Any, Union
 
 from .profiles import profiles
 
@@ -91,7 +91,7 @@ def __init__(self, profile: str):
 class SortingFunctionDoesNotExist(ISortError):
     """Raised when the specified sorting function isn't available"""
 
-    def __init__(self, sort_order: str, available_sort_orders: List[str]):
+    def __init__(self, sort_order: str, available_sort_orders: list[str]):
         super().__init__(
             f"Specified sort_order of {sort_order} does not exist. "
             f"Available sort_orders: {','.join(available_sort_orders)}."
@@ -113,7 +113,7 @@ class LiteralParsingFailure(ISortError):
     the given data structure.
     """
 
-    def __init__(self, code: str, original_error: Union[Exception, Type[Exception]]):
+    def __init__(self, code: str, original_error: Union[Exception, type[Exception]]):
         super().__init__(
             f"isort failed to parse the given literal {code}. It's important to note "
             "that isort literal sorting only supports simple literals parsable by "
@@ -164,7 +164,7 @@ class UnsupportedSettings(ISortError):
     def _format_option(name: str, value: Any, source: str) -> str:
         return f"\t- {name} = {value}  (source: '{source}')"
 
-    def __init__(self, unsupported_settings: Dict[str, Dict[str, str]]):
+    def __init__(self, unsupported_settings: dict[str, dict[str, str]]):
         errors = "\n".join(
             self._format_option(name, **option) for name, option in unsupported_settings.items()
         )

isort/files.py

@@ -1,15 +1,15 @@
 import os
+from collections.abc import Iterable, Iterator
 from pathlib import Path
-from typing import Iterable, Iterator, List, Set
 
 from isort.settings import Config
 
 
 def find(
-    paths: Iterable[str], config: Config, skipped: List[str], broken: List[str]
+    paths: Iterable[str], config: Config, skipped: list[str], broken: list[str]
 ) -> Iterator[str]:
     """Fines and provides an iterator for all Python source files defined in paths."""
-    visited_dirs: Set[Path] = set()
+    visited_dirs: set[Path] = set()
 
     for path in paths:
         if os.path.isdir(path):

isort/hooks.py

@@ -7,12 +7,12 @@
 import os
 import subprocess  # nosec
 from pathlib import Path
-from typing import List, Optional
+from typing import Optional
 
 from isort import Config, api, exceptions
 
 
-def get_output(command: List[str]) -> str:
+def get_output(command: list[str]) -> str:
     """Run a command and return raw output
 
     :param str command: the command to run
@@ -22,7 +22,7 @@ def get_output(command: List[str]) -> str:
     return result.stdout.decode()
 
 
-def get_lines(command: List[str]) -> List[str]:
+def get_lines(command: list[str]) -> list[str]:
     """Run a command and return lines of output
 
     :param str command: the command to run
@@ -37,7 +37,7 @@ def git_hook(
     modify: bool = False,
     lazy: bool = False,
     settings_file: str = "",
-    directories: Optional[List[str]] = None,
+    directories: Optional[list[str]] = None,
 ) -> int:
     """Git pre-commit hook to check staged files for isort errors
 

isort/identify.py

@@ -2,16 +2,17 @@
 Eventually this will likely replace parse.py
 """
 
+from collections.abc import Iterator
 from functools import partial
 from pathlib import Path
-from typing import Iterator, NamedTuple, Optional, TextIO, Tuple
+from typing import NamedTuple, Optional, TextIO
 
 from isort.parse import normalize_line, skip_line, strip_syntax
 
 from .comments import parse as parse_comments
 from .settings import DEFAULT_CONFIG, Config
 
-STATEMENT_DECLARATIONS: Tuple[str, ...] = ("def ", "cdef ", "cpdef ", "class ", "@", "async def")
+STATEMENT_DECLARATIONS: tuple[str, ...] = ("def ", "cdef ", "cpdef ", "class ", "@", "async def")
 
 
 class Import(NamedTuple):

isort/io.py

@@ -3,10 +3,11 @@
 import dataclasses
 import re
 import tokenize
+from collections.abc import Iterator
 from contextlib import contextmanager
 from io import BytesIO, StringIO, TextIOWrapper
 from pathlib import Path
-from typing import Any, Callable, Iterator, TextIO, Union
+from typing import Any, Callable, TextIO, Union
 
 from isort.exceptions import UnsupportedEncoding
 

isort/literal.py

@@ -1,6 +1,6 @@
 import ast
 from pprint import PrettyPrinter
-from typing import Any, Callable, Dict, List, Set, Tuple
+from typing import Any, Callable
 
 from isort.exceptions import (
     AssignmentsFormatMismatch,
@@ -17,7 +17,7 @@ def __init__(self, config: Config):
         super().__init__(width=config.line_length, compact=True)
 
 
-type_mapping: Dict[str, Tuple[type, Callable[[Any, ISortPrettyPrinter], str]]] = {}
+type_mapping: dict[str, tuple[type, Callable[[Any, ISortPrettyPrinter], str]]] = {}
 
 
 def assignments(code: str) -> str:
@@ -85,30 +85,30 @@ def wrap(
 
 
 @register_type("dict", dict)
-def _dict(value: Dict[Any, Any], printer: ISortPrettyPrinter) -> str:
+def _dict(value: dict[Any, Any], printer: ISortPrettyPrinter) -> str:
     return printer.pformat(dict(sorted(value.items(), key=lambda item: item[1])))
 
 
 @register_type("list", list)
-def _list(value: List[Any], printer: ISortPrettyPrinter) -> str:
+def _list(value: list[Any], printer: ISortPrettyPrinter) -> str:
     return printer.pformat(sorted(value))
 
 
 @register_type("unique-list", list)
-def _unique_list(value: List[Any], printer: ISortPrettyPrinter) -> str:
+def _unique_list(value: list[Any], printer: ISortPrettyPrinter) -> str:
     return printer.pformat(sorted(set(value)))
 
 
 @register_type("set", set)
-def _set(value: Set[Any], printer: ISortPrettyPrinter) -> str:
+def _set(value: set[Any], printer: ISortPrettyPrinter) -> str:
     return "{" + printer.pformat(tuple(sorted(value)))[1:-1] + "}"
 
 
 @register_type("tuple", tuple)
-def _tuple(value: Tuple[Any, ...], printer: ISortPrettyPrinter) -> str:
+def _tuple(value: tuple[Any, ...], printer: ISortPrettyPrinter) -> str:
     return printer.pformat(tuple(sorted(value)))
 
 
 @register_type("unique-tuple", tuple)
-def _unique_tuple(value: Tuple[Any, ...], printer: ISortPrettyPrinter) -> str:
+def _unique_tuple(value: tuple[Any, ...], printer: ISortPrettyPrinter) -> str:
     return printer.pformat(tuple(sorted(set(value))))