importlib: improve bytes handling (#9070)

stdlib/importlib/abc.pyi

@@ -1,12 +1,19 @@
 import sys
 import types
-from _typeshed import OpenBinaryMode, OpenBinaryModeReading, OpenBinaryModeUpdating, OpenBinaryModeWriting, OpenTextMode
+from _typeshed import (
+    OpenBinaryMode,
+    OpenBinaryModeReading,
+    OpenBinaryModeUpdating,
+    OpenBinaryModeWriting,
+    OpenTextMode,
+    ReadableBuffer,
+)
 from abc import ABCMeta, abstractmethod
 from collections.abc import Iterator, Mapping, Sequence
 from importlib.machinery import ModuleSpec
 from io import BufferedRandom, BufferedReader, BufferedWriter, FileIO, TextIOWrapper
 from typing import IO, Any, BinaryIO, NoReturn, Protocol, overload, runtime_checkable
-from typing_extensions import Literal, TypeAlias
+from typing_extensions import Literal
 
 if sys.version_info >= (3, 11):
     __all__ = [
@@ -24,8 +31,6 @@ if sys.version_info >= (3, 11):
         "TraversableResources",
     ]
 
-_Path: TypeAlias = bytes | str
-
 class Finder(metaclass=ABCMeta): ...
 
 class Loader(metaclass=ABCMeta):
@@ -38,7 +43,7 @@ class Loader(metaclass=ABCMeta):
 
 class ResourceLoader(Loader):
     @abstractmethod
-    def get_data(self, path: _Path) -> bytes: ...
+    def get_data(self, path: str) -> bytes: ...
 
 class InspectLoader(Loader):
     def is_package(self, fullname: str) -> bool: ...
@@ -47,40 +52,40 @@ class InspectLoader(Loader):
     def get_source(self, fullname: str) -> str | None: ...
     def exec_module(self, module: types.ModuleType) -> None: ...
     @staticmethod
-    def source_to_code(data: bytes | str, path: str = ...) -> types.CodeType: ...
+    def source_to_code(data: ReadableBuffer | str, path: str = ...) -> types.CodeType: ...
 
 class ExecutionLoader(InspectLoader):
     @abstractmethod
-    def get_filename(self, fullname: str) -> _Path: ...
+    def get_filename(self, fullname: str) -> str: ...
 
 class SourceLoader(ResourceLoader, ExecutionLoader, metaclass=ABCMeta):
-    def path_mtime(self, path: _Path) -> float: ...
-    def set_data(self, path: _Path, data: bytes) -> None: ...
+    def path_mtime(self, path: str) -> float: ...
+    def set_data(self, path: str, data: bytes) -> None: ...
     def get_source(self, fullname: str) -> str | None: ...
-    def path_stats(self, path: _Path) -> Mapping[str, Any]: ...
+    def path_stats(self, path: str) -> Mapping[str, Any]: ...
 
 # Please keep in sync with sys._MetaPathFinder
 class MetaPathFinder(Finder):
-    def find_module(self, fullname: str, path: Sequence[_Path] | None) -> Loader | None: ...
+    def find_module(self, fullname: str, path: Sequence[str] | None) -> Loader | None: ...
     def invalidate_caches(self) -> None: ...
     # Not defined on the actual class, but expected to exist.
     def find_spec(
-        self, fullname: str, path: Sequence[_Path] | None, target: types.ModuleType | None = ...
+        self, fullname: str, path: Sequence[str] | None, target: types.ModuleType | None = ...
     ) -> ModuleSpec | None: ...
 
 class PathEntryFinder(Finder):
     def find_module(self, fullname: str) -> Loader | None: ...
-    def find_loader(self, fullname: str) -> tuple[Loader | None, Sequence[_Path]]: ...
+    def find_loader(self, fullname: str) -> tuple[Loader | None, Sequence[str]]: ...
     def invalidate_caches(self) -> None: ...
     # Not defined on the actual class, but expected to exist.
     def find_spec(self, fullname: str, target: types.ModuleType | None = ...) -> ModuleSpec | None: ...
 
 class FileLoader(ResourceLoader, ExecutionLoader, metaclass=ABCMeta):
     name: str
-    path: _Path
-    def __init__(self, fullname: str, path: _Path) -> None: ...
-    def get_data(self, path: _Path) -> bytes: ...
-    def get_filename(self, name: str | None = ...) -> _Path: ...
+    path: str
+    def __init__(self, fullname: str, path: str) -> None: ...
+    def get_data(self, path: str) -> bytes: ...
+    def get_filename(self, name: str | None = ...) -> str: ...
     def load_module(self, name: str | None = ...) -> types.ModuleType: ...
 
 class ResourceReader(metaclass=ABCMeta):

stdlib/importlib/machinery.pyi

@@ -1,6 +1,7 @@
 import importlib.abc
 import sys
 import types
+from _typeshed import ReadableBuffer
 from collections.abc import Callable, Iterable, Sequence
 from typing import Any
 
@@ -31,10 +32,10 @@ class ModuleSpec:
 class BuiltinImporter(importlib.abc.MetaPathFinder, importlib.abc.InspectLoader):
     # MetaPathFinder
     @classmethod
-    def find_module(cls, fullname: str, path: Sequence[importlib.abc._Path] | None = ...) -> importlib.abc.Loader | None: ...
+    def find_module(cls, fullname: str, path: Sequence[str] | None = ...) -> importlib.abc.Loader | None: ...
     @classmethod
     def find_spec(
-        cls, fullname: str, path: Sequence[importlib.abc._Path] | None = ..., target: types.ModuleType | None = ...
+        cls, fullname: str, path: Sequence[str] | None = ..., target: types.ModuleType | None = ...
     ) -> ModuleSpec | None: ...
     # InspectLoader
     @classmethod
@@ -62,10 +63,10 @@ class BuiltinImporter(importlib.abc.MetaPathFinder, importlib.abc.InspectLoader)
 class FrozenImporter(importlib.abc.MetaPathFinder, importlib.abc.InspectLoader):
     # MetaPathFinder
     @classmethod
-    def find_module(cls, fullname: str, path: Sequence[importlib.abc._Path] | None = ...) -> importlib.abc.Loader | None: ...
+    def find_module(cls, fullname: str, path: Sequence[str] | None = ...) -> importlib.abc.Loader | None: ...
     @classmethod
     def find_spec(
-        cls, fullname: str, path: Sequence[importlib.abc._Path] | None = ..., target: types.ModuleType | None = ...
+        cls, fullname: str, path: Sequence[str] | None = ..., target: types.ModuleType | None = ...
     ) -> ModuleSpec | None: ...
     # InspectLoader
     @classmethod
@@ -91,10 +92,10 @@ class FrozenImporter(importlib.abc.MetaPathFinder, importlib.abc.InspectLoader):
 
 class WindowsRegistryFinder(importlib.abc.MetaPathFinder):
     @classmethod
-    def find_module(cls, fullname: str, path: Sequence[importlib.abc._Path] | None = ...) -> importlib.abc.Loader | None: ...
+    def find_module(cls, fullname: str, path: Sequence[str] | None = ...) -> importlib.abc.Loader | None: ...
     @classmethod
     def find_spec(
-        cls, fullname: str, path: Sequence[importlib.abc._Path] | None = ..., target: types.ModuleType | None = ...
+        cls, fullname: str, path: Sequence[str] | None = ..., target: types.ModuleType | None = ...
     ) -> ModuleSpec | None: ...
 
 class PathFinder:
@@ -113,10 +114,10 @@ class PathFinder:
 
     @classmethod
     def find_spec(
-        cls, fullname: str, path: Sequence[bytes | str] | None = ..., target: types.ModuleType | None = ...
+        cls, fullname: str, path: Sequence[str] | None = ..., target: types.ModuleType | None = ...
     ) -> ModuleSpec | None: ...
     @classmethod
-    def find_module(cls, fullname: str, path: Sequence[bytes | str] | None = ...) -> importlib.abc.Loader | None: ...
+    def find_module(cls, fullname: str, path: Sequence[str] | None = ...) -> importlib.abc.Loader | None: ...
 
 SOURCE_SUFFIXES: list[str]
 DEBUG_BYTECODE_SUFFIXES: list[str]
@@ -135,13 +136,13 @@ class FileFinder(importlib.abc.PathEntryFinder):
     ) -> Callable[[str], importlib.abc.PathEntryFinder]: ...
 
 class SourceFileLoader(importlib.abc.FileLoader, importlib.abc.SourceLoader):
-    def set_data(self, path: importlib.abc._Path, data: bytes, *, _mode: int = ...) -> None: ...
+    def set_data(self, path: str, data: ReadableBuffer, *, _mode: int = ...) -> None: ...
 
 class SourcelessFileLoader(importlib.abc.FileLoader, importlib.abc.SourceLoader): ...
 
 class ExtensionFileLoader(importlib.abc.ExecutionLoader):
-    def __init__(self, name: str, path: importlib.abc._Path) -> None: ...
-    def get_filename(self, name: str | None = ...) -> importlib.abc._Path: ...
+    def __init__(self, name: str, path: str) -> None: ...
+    def get_filename(self, name: str | None = ...) -> str: ...
     def get_source(self, fullname: str) -> None: ...
     def create_module(self, spec: ModuleSpec) -> types.ModuleType: ...
     def exec_module(self, module: types.ModuleType) -> None: ...

stdlib/importlib/util.pyi

@@ -1,7 +1,7 @@
 import importlib.abc
 import importlib.machinery
 import types
-from _typeshed import StrOrBytesPath
+from _typeshed import ReadableBuffer, StrOrBytesPath
 from collections.abc import Callable
 from typing import Any
 from typing_extensions import ParamSpec
@@ -17,7 +17,7 @@ MAGIC_NUMBER: bytes
 
 def cache_from_source(path: str, debug_override: bool | None = ..., *, optimization: Any | None = ...) -> str: ...
 def source_from_cache(path: str) -> str: ...
-def decode_source(source_bytes: bytes) -> str: ...
+def decode_source(source_bytes: ReadableBuffer) -> str: ...
 def find_spec(name: str, package: str | None = ...) -> importlib.machinery.ModuleSpec | None: ...
 def spec_from_loader(
     name: str, loader: importlib.abc.Loader | None, *, origin: str | None = ..., is_package: bool | None = ...
@@ -37,4 +37,4 @@ class LazyLoader(importlib.abc.Loader):
     def factory(cls, loader: importlib.abc.Loader) -> Callable[..., LazyLoader]: ...
     def exec_module(self, module: types.ModuleType) -> None: ...
 
-def source_hash(source_bytes: bytes) -> int: ...
+def source_hash(source_bytes: ReadableBuffer) -> int: ...

stubs/pyinstaller/PyInstaller/compat.pyi

@@ -1,7 +1,6 @@
 # https://pyinstaller.org/en/stable/hooks.html#module-PyInstaller.compat
 from _typeshed import FileDescriptor, GenericPath, StrOrBytesPath
 from collections.abc import Iterable
-from importlib.abc import _Path
 from types import ModuleType
 from typing import AnyStr, overload
 from typing_extensions import Literal, TypeAlias
@@ -69,7 +68,7 @@ def exec_python(*args: str, **kwargs: str | None) -> str: ...
 def exec_python_rc(*args: str, **kwargs: str | None) -> int: ...
 def expand_path(path: GenericPath[AnyStr]) -> AnyStr: ...
 def getsitepackages(prefixes: Iterable[str] | None = ...) -> list[str]: ...
-def importlib_load_source(name: str, pathname: _Path) -> ModuleType: ...
+def importlib_load_source(name: str, pathname: str) -> ModuleType: ...
 
 PY3_BASE_MODULES: set[str]
 PURE_PYTHON_MODULE_TYPES: set[str]