From 3a06fc7c1ab25e40edc706cfeca20bcbe0cd6abd Mon Sep 17 00:00:00 2001 From: Avasam Date: Thu, 29 Feb 2024 01:48:26 -0500 Subject: [PATCH] `setuptools` & `pkg_resources`: Complete `VendorImporter` class (#11495) --- .../pkg_resources/extern/__init__.pyi | 27 ++++++++++--------- .../setuptools/setuptools/extern/__init__.pyi | 27 ++++++++++--------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/stubs/setuptools/pkg_resources/extern/__init__.pyi b/stubs/setuptools/pkg_resources/extern/__init__.pyi index 663a01e91..1a2b2d849 100644 --- a/stubs/setuptools/pkg_resources/extern/__init__.pyi +++ b/stubs/setuptools/pkg_resources/extern/__init__.pyi @@ -1,17 +1,20 @@ -from _typeshed import Incomplete -from collections.abc import Generator +from collections.abc import Generator, Iterable, Sequence +from importlib.machinery import ModuleSpec +from types import ModuleType class VendorImporter: - root_name: Incomplete - vendored_names: Incomplete - vendor_pkg: Incomplete - def __init__(self, root_name, vendored_names=(), vendor_pkg: Incomplete | None = None) -> None: ... + root_name: str + vendored_names: set[str] + vendor_pkg: str + def __init__(self, root_name: str, vendored_names: Iterable[str] = (), vendor_pkg: str | None = None) -> None: ... @property - def search_path(self) -> Generator[Incomplete, None, None]: ... - def load_module(self, fullname): ... - def create_module(self, spec): ... - def exec_module(self, module) -> None: ... - def find_spec(self, fullname, path: Incomplete | None = None, target: Incomplete | None = None): ... + def search_path(self) -> Generator[str, None, None]: ... + def load_module(self, fullname: str) -> ModuleType: ... + def create_module(self, spec: ModuleSpec) -> ModuleType: ... + def exec_module(self, module: ModuleType) -> None: ... + def find_spec( + self, fullname: str, path: Sequence[str] | None = None, target: ModuleType | None = None + ) -> ModuleSpec | None: ... def install(self) -> None: ... -names: Incomplete +names: tuple[str, ...] diff --git a/stubs/setuptools/setuptools/extern/__init__.pyi b/stubs/setuptools/setuptools/extern/__init__.pyi index 080cdf737..1a2b2d849 100644 --- a/stubs/setuptools/setuptools/extern/__init__.pyi +++ b/stubs/setuptools/setuptools/extern/__init__.pyi @@ -1,17 +1,20 @@ -from _typeshed import Incomplete -from typing import Any +from collections.abc import Generator, Iterable, Sequence +from importlib.machinery import ModuleSpec +from types import ModuleType class VendorImporter: - root_name: Any - vendored_names: Any - vendor_pkg: Any - def __init__(self, root_name, vendored_names=(), vendor_pkg: Incomplete | None = None) -> None: ... + root_name: str + vendored_names: set[str] + vendor_pkg: str + def __init__(self, root_name: str, vendored_names: Iterable[str] = (), vendor_pkg: str | None = None) -> None: ... @property - def search_path(self) -> None: ... - def load_module(self, fullname): ... - def create_module(self, spec): ... - def exec_module(self, module) -> None: ... - def find_spec(self, fullname, path: Incomplete | None = None, target: Incomplete | None = None): ... + def search_path(self) -> Generator[str, None, None]: ... + def load_module(self, fullname: str) -> ModuleType: ... + def create_module(self, spec: ModuleSpec) -> ModuleType: ... + def exec_module(self, module: ModuleType) -> None: ... + def find_spec( + self, fullname: str, path: Sequence[str] | None = None, target: ModuleType | None = None + ) -> ModuleSpec | None: ... def install(self) -> None: ... -names: Any +names: tuple[str, ...]