Skip to content

Commit 14605d0

Browse files
authored
Complete importlib.readers (#13356)
1 parent 3658ba8 commit 14605d0

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

pyrightconfig.stricter.json

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"**/@tests/test_cases",
1111
"stdlib/distutils/command",
1212
"stdlib/distutils/dist.pyi",
13-
"stdlib/importlib/readers.pyi",
1413
"stdlib/lib2to3/fixes/*.pyi",
1514
"stdlib/numbers.pyi",
1615
"stdlib/optparse.pyi",

stdlib/importlib/readers.pyi

+9-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@
55
import pathlib
66
import sys
77
import zipfile
8-
from _typeshed import Incomplete, StrPath
8+
from _typeshed import StrPath
99
from collections.abc import Iterable, Iterator
1010
from io import BufferedReader
1111
from typing import Literal, NoReturn, TypeVar
1212
from typing_extensions import Never
1313

14+
if sys.version_info >= (3, 10):
15+
from importlib._bootstrap_external import FileLoader
16+
from zipimport import zipimporter
17+
1418
if sys.version_info >= (3, 11):
1519
import importlib.resources.abc as abc
1620
else:
@@ -27,14 +31,14 @@ if sys.version_info >= (3, 10):
2731

2832
class FileReader(abc.TraversableResources):
2933
path: pathlib.Path
30-
def __init__(self, loader) -> None: ...
34+
def __init__(self, loader: FileLoader) -> None: ...
3135
def resource_path(self, resource: StrPath) -> str: ...
3236
def files(self) -> pathlib.Path: ...
3337

3438
class ZipReader(abc.TraversableResources):
3539
prefix: str
36-
archive: Incomplete
37-
def __init__(self, loader, module: str) -> None: ...
40+
archive: str
41+
def __init__(self, loader: zipimporter, module: str) -> None: ...
3842
def open_resource(self, resource: str) -> BufferedReader: ...
3943
def is_resource(self, path: StrPath) -> bool: ...
4044
def files(self) -> zipfile.Path: ...
@@ -63,6 +67,6 @@ if sys.version_info >= (3, 10):
6367

6468
class NamespaceReader(abc.TraversableResources):
6569
path: MultiplexedPath
66-
def __init__(self, namespace_path) -> None: ...
70+
def __init__(self, namespace_path: Iterable[str]) -> None: ...
6771
def resource_path(self, resource: str) -> str: ...
6872
def files(self) -> MultiplexedPath: ...

0 commit comments

Comments
 (0)