Misc tidying (python-poetry#570)

dimbleby · web-flow · commit e81166e744fb · 2023-04-17T11:26:21.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,7 +11,6 @@ repos:
       - id: trailing-whitespace
         exclude: "vendors/patches/jsonschema.patch"
       - id: end-of-file-fixer
-      - id: debug-statements
       - id: check-merge-conflict
       - id: check-case-conflict
       - id: check-json
diff --git a/src/poetry/core/constraints/generic/empty_constraint.py b/src/poetry/core/constraints/generic/empty_constraint.py
@@ -6,9 +6,6 @@
 class EmptyConstraint(BaseConstraint):
     pretty_string = None
 
-    def matches(self, _: BaseConstraint) -> bool:
-        return True
-
     def is_empty(self) -> bool:
         return True
 
diff --git a/src/poetry/core/factory.py b/src/poetry/core/factory.py
@@ -7,7 +7,6 @@
 from typing import Any
 from typing import Dict
 from typing import List
-from typing import Mapping
 from typing import Union
 from warnings import warn
 
@@ -18,6 +17,8 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Mapping
+
     from poetry.core.packages.dependency import Dependency
     from poetry.core.packages.dependency_group import DependencyGroup
     from poetry.core.packages.project_package import ProjectPackage
@@ -260,7 +261,7 @@ def create_dependency(
                     'the "allows-prereleases" property, which is deprecated. '
                     'Use "allow-prereleases" instead.'
                 )
-                warn(message, DeprecationWarning)
+                warn(message, DeprecationWarning, stacklevel=2)
                 logger.warning(message)
 
             allows_prereleases = constraint.get(
diff --git a/src/poetry/core/masonry/builders/builder.py b/src/poetry/core/masonry/builders/builder.py
@@ -106,10 +106,7 @@ def find_excluded_files(self, fmt: str | None = None) -> set[str]:
 
             # Checking VCS
             vcs = get_vcs(self._path)
-            if not vcs:
-                vcs_ignored_files = set()
-            else:
-                vcs_ignored_files = set(vcs.get_ignored_files())
+            vcs_ignored_files = set(vcs.get_ignored_files()) if vcs else set()
 
             explicitly_excluded = set()
             for excluded_glob in self._package.exclude:
diff --git a/src/poetry/core/masonry/builders/sdist.py b/src/poetry/core/masonry/builders/sdist.py
@@ -14,15 +14,15 @@
 from posixpath import join as pjoin
 from pprint import pformat
 from typing import TYPE_CHECKING
-from typing import Iterable
-from typing import Iterator
 
 from poetry.core.masonry.builders.builder import Builder
 from poetry.core.masonry.builders.builder import BuildIncludeFile
 from poetry.core.masonry.utils.helpers import distribution_name
 
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+    from collections.abc import Iterator
     from tarfile import TarInfo
 
     from poetry.core.masonry.utils.package_include import PackageInclude
@@ -280,13 +280,11 @@ def find_nearest_pkg(rel_path: str) -> tuple[str, str]:
                 continue
 
             is_subpkg = any(
-                [filename.endswith(".py") for filename in filenames]
+                filename.endswith(".py") for filename in filenames
             ) and not all(
-                [
-                    self.is_excluded(Path(path, filename).relative_to(self._path))
-                    for filename in filenames
-                    if filename.endswith(".py")
-                ]
+                self.is_excluded(Path(path, filename).relative_to(self._path))
+                for filename in filenames
+                if filename.endswith(".py")
             )
             if is_subpkg:
                 subpkg_paths.add(from_top_level)
diff --git a/src/poetry/core/masonry/builders/wheel.py b/src/poetry/core/masonry/builders/wheel.py
@@ -15,7 +15,6 @@
 from io import StringIO
 from pathlib import Path
 from typing import TYPE_CHECKING
-from typing import Iterator
 from typing import TextIO
 
 from packaging.tags import sys_tags
@@ -31,6 +30,8 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
+
     from packaging.utils import NormalizedName
 
     from poetry.core.poetry import Poetry
@@ -357,7 +358,7 @@ def _add_file(
             zinfo.external_attr |= 0x10  # MS-DOS directory flag
 
         hashsum = hashlib.sha256()
-        with open(full_path, "rb") as src:
+        with full_path.open("rb") as src:
             while True:
                 buf = src.read(1024 * 8)
                 if not buf:
diff --git a/src/poetry/core/packages/dependency.py b/src/poetry/core/packages/dependency.py
@@ -7,7 +7,6 @@
 from contextlib import suppress
 from pathlib import Path
 from typing import TYPE_CHECKING
-from typing import Iterable
 from typing import TypeVar
 
 from packaging.utils import canonicalize_name
@@ -23,6 +22,8 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from packaging.utils import NormalizedName
 
     from poetry.core.constraints.version import VersionConstraint
@@ -345,9 +346,9 @@ def create_from_pep_508(
         cls, name: str, relative_to: Path | None = None
     ) -> Dependency:
         """
-        Resolve a PEP-508 requirement string to a `Dependency` instance. If a `relative_to`
-        path is specified, this is used as the base directory if the identified dependency is
-        of file or directory type.
+        Resolve a PEP-508 requirement string to a `Dependency` instance. If a
+        `relative_to` path is specified, this is used as the base directory if the
+        identified dependency is of file or directory type.
         """
         from poetry.core.packages.url_dependency import URLDependency
         from poetry.core.packages.utils.link import Link
@@ -459,10 +460,7 @@ def create_from_pep_508(
                 dep._constraint = parse_constraint(version)
         else:
             constraint: VersionConstraint | str
-            if req.pretty_constraint:
-                constraint = req.constraint
-            else:
-                constraint = "*"
+            constraint = req.constraint if req.pretty_constraint else "*"
             dep = Dependency(name, constraint, extras=req.extras)
 
         if req.marker:
@@ -507,8 +505,8 @@ def _make_file_or_dir_dep(
     extras: list[str] | None = None,
 ) -> FileDependency | DirectoryDependency | None:
     """
-    Helper function to create a file or directoru dependency with the given arguments. If
-    path is not a file or directory that exists, `None` is returned.
+    Helper function to create a file or directoru dependency with the given arguments.
+    If path is not a file or directory that exists, `None` is returned.
     """
     from poetry.core.packages.directory_dependency import DirectoryDependency
     from poetry.core.packages.file_dependency import FileDependency
diff --git a/src/poetry/core/packages/directory_dependency.py b/src/poetry/core/packages/directory_dependency.py
@@ -3,14 +3,14 @@
 import functools
 
 from typing import TYPE_CHECKING
-from typing import Iterable
 
 from poetry.core.packages.path_dependency import PathDependency
 from poetry.core.packages.utils.utils import is_python_project
 from poetry.core.pyproject.toml import PyProjectTOML
 
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
     from pathlib import Path
 
 
diff --git a/src/poetry/core/packages/file_dependency.py b/src/poetry/core/packages/file_dependency.py
@@ -5,12 +5,12 @@
 import warnings
 
 from typing import TYPE_CHECKING
-from typing import Iterable
 
 from poetry.core.packages.path_dependency import PathDependency
 
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
     from pathlib import Path
 
 
diff --git a/src/poetry/core/packages/package.py b/src/poetry/core/packages/package.py
@@ -5,11 +5,7 @@
 import warnings
 
 from contextlib import contextmanager
-from pathlib import Path
 from typing import TYPE_CHECKING
-from typing import Collection
-from typing import Iterable
-from typing import Iterator
 from typing import TypeVar
 
 from poetry.core.constraints.version import parse_constraint
@@ -22,6 +18,11 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Collection
+    from collections.abc import Iterable
+    from collections.abc import Iterator
+    from pathlib import Path
+
     from packaging.utils import NormalizedName
 
     from poetry.core.constraints.version import Version
diff --git a/src/poetry/core/packages/path_dependency.py b/src/poetry/core/packages/path_dependency.py
@@ -5,12 +5,16 @@
 from abc import ABC
 from abc import abstractmethod
 from pathlib import Path
-from typing import Iterable
+from typing import TYPE_CHECKING
 
 from poetry.core.packages.dependency import Dependency
 from poetry.core.packages.utils.utils import path_to_url
 
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/src/poetry/core/packages/specification.py b/src/poetry/core/packages/specification.py
@@ -3,13 +3,14 @@
 import copy
 
 from typing import TYPE_CHECKING
-from typing import Iterable
 from typing import TypeVar
 
 from packaging.utils import canonicalize_name
 
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from packaging.utils import NormalizedName
 
     T = TypeVar("T", bound="PackageSpecification")
diff --git a/src/poetry/core/packages/url_dependency.py b/src/poetry/core/packages/url_dependency.py
@@ -1,11 +1,15 @@
 from __future__ import annotations
 
-from typing import Iterable
+from typing import TYPE_CHECKING
 from urllib.parse import urlparse
 
 from poetry.core.packages.dependency import Dependency
 
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+
 class URLDependency(Dependency):
     def __init__(
         self,
diff --git a/src/poetry/core/packages/vcs_dependency.py b/src/poetry/core/packages/vcs_dependency.py
@@ -1,10 +1,14 @@
 from __future__ import annotations
 
-from typing import Iterable
+from typing import TYPE_CHECKING
 
 from poetry.core.packages.dependency import Dependency
 
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+
 class VCSDependency(Dependency):
     """
     Represents a VCS dependency
diff --git a/src/poetry/core/spdx/helpers.py b/src/poetry/core/spdx/helpers.py
@@ -2,7 +2,8 @@
 
 import functools
 import json
-import os
+
+from pathlib import Path
 
 from poetry.core.spdx.license import License
 
@@ -20,9 +21,9 @@ def license_by_id(identifier: str) -> License:
 @functools.lru_cache()
 def _load_licenses() -> dict[str, License]:
     licenses = {}
-    licenses_file = os.path.join(os.path.dirname(__file__), "data", "licenses.json")
+    licenses_file = Path(__file__).parent / "data" / "licenses.json"
 
-    with open(licenses_file, encoding="utf-8") as f:
+    with licenses_file.open(encoding="utf-8") as f:
         data = json.load(f)
 
     for name, license_info in data.items():
diff --git a/src/poetry/core/spdx/updater.py b/src/poetry/core/spdx/updater.py
@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import json
-import os
 
+from pathlib import Path
 from typing import Any
 from urllib.request import urlopen
 
@@ -13,13 +13,13 @@ class Updater:
     def __init__(self, base_url: str = BASE_URL) -> None:
         self._base_url = base_url
 
-    def dump(self, file: str | None = None) -> None:
+    def dump(self, file: Path | None = None) -> None:
         if file is None:
-            file = os.path.join(os.path.dirname(__file__), "data", "licenses.json")
+            file = Path(__file__).parent / "data" / "licenses.json"
 
         licenses_url = self._base_url + "licenses.json"
 
-        with open(file, "w", encoding="utf-8") as f:
+        with file.open("w", encoding="utf-8") as f:
             f.write(
                 json.dumps(self.get_licenses(licenses_url), indent=2, sort_keys=True)
             )
diff --git a/src/poetry/core/utils/helpers.py b/src/poetry/core/utils/helpers.py
@@ -9,14 +9,18 @@
 
 from contextlib import contextmanager
 from pathlib import Path
+from typing import TYPE_CHECKING
 from typing import Any
-from typing import Iterator
 
 from packaging.utils import canonicalize_name
 
 from poetry.core.version.pep440 import PEP440Version
 
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
+
 def combine_unicode(string: str) -> str:
     return unicodedata.normalize("NFC", string)
 
diff --git a/src/poetry/core/version/markers.py b/src/poetry/core/version/markers.py
@@ -8,9 +8,7 @@
 from abc import abstractmethod
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Callable
 from typing import Generic
-from typing import Iterable
 from typing import TypeVar
 from typing import Union
 
@@ -25,6 +23,9 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+    from collections.abc import Iterable
+
     from lark import Tree
 
 
diff --git a/src/poetry/core/version/pep440/parser.py b/src/poetry/core/version/pep440/parser.py
diff --git a/src/poetry/core/version/requirements.py b/src/poetry/core/version/requirements.py
