Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b38413d

Browse files
cdce8phauntsaninjaAlexWaygood
authored
Sync typeshed (#20080)
Source commit: python/typeshed@11c7821 --------- Co-authored-by: Shantanu <[email protected]> Co-authored-by: AlexWaygood <[email protected]>
1 parent e1643ae commit b38413d

20 files changed

+375
-232
lines changed

‎misc/typeshed_patches/0001-Remove-use-of-LiteralString-in-builtins-13743.patch‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 805d7fc06a8bee350959512e0908a18a87b7f8c2 Mon Sep 17 00:00:00 2001
1+
From 3229a6066cff3d80d6cb923322c2d42a300d0be3 Mon Sep 17 00:00:00 2001
22
From: Shantanu <[email protected]>
33
Date: Mon, 26 Sep 2022 12:55:07 -0700
44
Subject: [PATCH] Remove use of LiteralString in builtins (#13743)
@@ -8,7 +8,7 @@ Subject: [PATCH] Remove use of LiteralString in builtins (#13743)
88
1 file changed, 1 insertion(+), 99 deletions(-)
99

1010
diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
11-
index c7ab95482..3e93da36e 100644
11+
index 969d16876..044e264d2 100644
1212
--- a/mypy/typeshed/stdlib/builtins.pyi
1313
+++ b/mypy/typeshed/stdlib/builtins.pyi
1414
@@ -63,7 +63,6 @@ from typing import ( # noqa: Y022,UP035
@@ -19,10 +19,10 @@ index c7ab95482..3e93da36e 100644
1919
ParamSpec,
2020
Self,
2121
TypeAlias,
22-
@@ -468,31 +467,16 @@ class str(Sequence[str]):
23-
def __new__(cls, object: object = ...) -> Self: ...
22+
@@ -480,31 +479,16 @@ class str(Sequence[str]):
23+
def __new__(cls, object: object = "") -> Self: ...
2424
@overload
25-
def __new__(cls, object: ReadableBuffer, encoding: str = ..., errors: str = ...) -> Self: ...
25+
def __new__(cls, object: ReadableBuffer, encoding: str = "utf-8", errors: str = "strict") -> Self: ...
2626
- @overload
2727
- def capitalize(self: LiteralString) -> LiteralString: ...
2828
- @overload
@@ -35,23 +35,23 @@ index c7ab95482..3e93da36e 100644
3535
- def center(self: LiteralString, width: SupportsIndex, fillchar: LiteralString = " ", /) -> LiteralString: ...
3636
- @overload
3737
def center(self, width: SupportsIndex, fillchar: str = " ", /) -> str: ... # type: ignore[misc]
38-
def count(self, sub: str, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /) -> int: ...
38+
def count(self, sub: str, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> int: ...
3939
def encode(self, encoding: str = "utf-8", errors: str = "strict") -> bytes: ...
4040
def endswith(
41-
self, suffix: str | tuple[str, ...], start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
41+
self, suffix: str | tuple[str, ...], start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
4242
) -> bool: ...
4343
- @overload
4444
- def expandtabs(self: LiteralString, tabsize: SupportsIndex = 8) -> LiteralString: ...
4545
- @overload
4646
def expandtabs(self, tabsize: SupportsIndex = 8) -> str: ... # type: ignore[misc]
47-
def find(self, sub: str, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /) -> int: ...
47+
def find(self, sub: str, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> int: ...
4848
- @overload
4949
- def format(self: LiteralString, *args: LiteralString, **kwargs: LiteralString) -> LiteralString: ...
5050
- @overload
5151
def format(self, *args: object, **kwargs: object) -> str: ...
5252
def format_map(self, mapping: _FormatMapMapping, /) -> str: ...
53-
def index(self, sub: str, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /) -> int: ...
54-
@@ -508,98 +492,34 @@ class str(Sequence[str]):
53+
def index(self, sub: str, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> int: ...
54+
@@ -520,98 +504,34 @@ class str(Sequence[str]):
5555
def isspace(self) -> bool: ...
5656
def istitle(self) -> bool: ...
5757
def isupper(self) -> bool: ...
@@ -98,8 +98,8 @@ index c7ab95482..3e93da36e 100644
9898
- def removesuffix(self: LiteralString, suffix: LiteralString, /) -> LiteralString: ...
9999
- @overload
100100
def removesuffix(self, suffix: str, /) -> str: ... # type: ignore[misc]
101-
def rfind(self, sub: str, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /) -> int: ...
102-
def rindex(self, sub: str, start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /) -> int: ...
101+
def rfind(self, sub: str, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> int: ...
102+
def rindex(self, sub: str, start: SupportsIndex | None = None, end: SupportsIndex | None = None, /) -> int: ...
103103
- @overload
104104
- def rjust(self: LiteralString, width: SupportsIndex, fillchar: LiteralString = " ", /) -> LiteralString: ...
105105
- @overload
@@ -125,7 +125,7 @@ index c7ab95482..3e93da36e 100644
125125
- @overload
126126
def splitlines(self, keepends: bool = False) -> list[str]: ... # type: ignore[misc]
127127
def startswith(
128-
self, prefix: str | tuple[str, ...], start: SupportsIndex | None = ..., end: SupportsIndex | None = ..., /
128+
self, prefix: str | tuple[str, ...], start: SupportsIndex | None = None, end: SupportsIndex | None = None, /
129129
) -> bool: ...
130130
- @overload
131131
- def strip(self: LiteralString, chars: LiteralString | None = None, /) -> LiteralString: ...
@@ -150,7 +150,7 @@ index c7ab95482..3e93da36e 100644
150150
def zfill(self, width: SupportsIndex, /) -> str: ... # type: ignore[misc]
151151
@staticmethod
152152
@overload
153-
@@ -610,39 +530,21 @@ class str(Sequence[str]):
153+
@@ -622,39 +542,21 @@ class str(Sequence[str]):
154154
@staticmethod
155155
@overload
156156
def maketrans(x: str, y: str, z: str, /) -> dict[int, int | None]: ...
@@ -192,5 +192,5 @@ index c7ab95482..3e93da36e 100644
192192
def __getnewargs__(self) -> tuple[str]: ...
193193
def __format__(self, format_spec: str, /) -> str: ...
194194
--
195-
2.50.1
195+
2.51.1
196196

‎misc/typeshed_patches/0001-Revert-Remove-redundant-inheritances-from-Iterator.patch‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 438dbb1300b77331940d7db8f010e97305745116 Mon Sep 17 00:00:00 2001
1+
From 7678bc3f80e4d3f04a0ff0ee3a7d51f49ae4c465 Mon Sep 17 00:00:00 2001
22
From: Marc Mueller <[email protected]>
33
Date: Sat, 21 Dec 2024 22:36:38 +0100
44
Subject: [PATCH] Revert Remove redundant inheritances from Iterator in
@@ -36,10 +36,10 @@ index d663f5d93..f43178e4d 100644
3636
@property
3737
def _exception(self) -> BaseException | None: ...
3838
diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
39-
index f2dd00079..784ee7eac 100644
39+
index 044e264d2..6d813f172 100644
4040
--- a/mypy/typeshed/stdlib/builtins.pyi
4141
+++ b/mypy/typeshed/stdlib/builtins.pyi
42-
@@ -1209,7 +1209,7 @@ class frozenset(AbstractSet[_T_co]):
42+
@@ -1210,7 +1210,7 @@ class frozenset(AbstractSet[_T_co]):
4343
def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
4444

4545
@disjoint_base
@@ -48,7 +48,7 @@ index f2dd00079..784ee7eac 100644
4848
def __new__(cls, iterable: Iterable[_T], start: int = 0) -> Self: ...
4949
def __iter__(self) -> Self: ...
5050
def __next__(self) -> tuple[int, _T]: ...
51-
@@ -1405,7 +1405,7 @@ else:
51+
@@ -1404,7 +1404,7 @@ else:
5252
exit: _sitebuiltins.Quitter
5353

5454
@disjoint_base
@@ -57,7 +57,7 @@ index f2dd00079..784ee7eac 100644
5757
@overload
5858
def __new__(cls, function: None, iterable: Iterable[_T | None], /) -> Self: ...
5959
@overload
60-
@@ -1469,7 +1469,7 @@ license: _sitebuiltins._Printer
60+
@@ -1468,7 +1468,7 @@ license: _sitebuiltins._Printer
6161

6262
def locals() -> dict[str, Any]: ...
6363
@disjoint_base
@@ -66,7 +66,7 @@ index f2dd00079..784ee7eac 100644
6666
# 3.14 adds `strict` argument.
6767
if sys.version_info >= (3, 14):
6868
@overload
69-
@@ -1776,7 +1776,7 @@ def pow(base: _SupportsSomeKindOfPow, exp: complex, mod: None = None) -> complex
69+
@@ -1775,7 +1775,7 @@ def pow(base: _SupportsSomeKindOfPow, exp: complex, mod: None = None) -> complex
7070
quit: _sitebuiltins.Quitter
7171

7272
@disjoint_base
@@ -75,15 +75,15 @@ index f2dd00079..784ee7eac 100644
7575
@overload
7676
def __new__(cls, sequence: Reversible[_T], /) -> Iterator[_T]: ... # type: ignore[misc]
7777
@overload
78-
@@ -1840,7 +1840,7 @@ def vars(object: type, /) -> types.MappingProxyType[str, Any]: ...
78+
@@ -1839,7 +1839,7 @@ def vars(object: type, /) -> types.MappingProxyType[str, Any]: ...
7979
@overload
8080
def vars(object: Any = ..., /) -> dict[str, Any]: ...
8181
@disjoint_base
8282
-class zip(Generic[_T_co]):
8383
+class zip(Iterator[_T_co]):
8484
if sys.version_info >= (3, 10):
8585
@overload
86-
def __new__(cls, *, strict: bool = ...) -> zip[Any]: ...
86+
def __new__(cls, *, strict: bool = False) -> zip[Any]: ...
8787
diff --git a/mypy/typeshed/stdlib/csv.pyi b/mypy/typeshed/stdlib/csv.pyi
8888
index 2c8e7109c..4ed0ab1d8 100644
8989
--- a/mypy/typeshed/stdlib/csv.pyi
@@ -326,5 +326,5 @@ index 6b0f1ba94..882cd143c 100644
326326
@property
327327
def connection(self) -> Connection: ...
328328
--
329-
2.51.0
329+
2.51.1
330330

‎mypy/typeshed/stdlib/_csv.pyi‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ else:
9292
def writerows(self, rows: Iterable[Iterable[Any]]) -> None: ...
9393

9494
def writer(
95-
csvfile: SupportsWrite[str],
95+
fileobj: SupportsWrite[str],
9696
/,
9797
dialect: _DialectLike = "excel",
9898
*,
@@ -106,7 +106,7 @@ def writer(
106106
strict: bool = False,
107107
) -> _writer: ...
108108
def reader(
109-
csvfile: Iterable[str],
109+
iterable: Iterable[str],
110110
/,
111111
dialect: _DialectLike = "excel",
112112
*,
@@ -121,7 +121,8 @@ def reader(
121121
) -> _reader: ...
122122
def register_dialect(
123123
name: str,
124-
dialect: type[Dialect | csv.Dialect] = ...,
124+
/,
125+
dialect: type[Dialect | csv.Dialect] | str = "excel",
125126
*,
126127
delimiter: str = ",",
127128
quotechar: str | None = '"',

‎mypy/typeshed/stdlib/_frozen_importlib_external.pyi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class SourceLoader(_LoaderBasics):
100100
def get_source(self, fullname: str) -> str | None: ...
101101
def path_stats(self, path: str) -> Mapping[str, Any]: ...
102102
def source_to_code(
103-
self, data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive, path: ReadableBuffer | StrPath
103+
self, data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive, path: bytes | StrPath
104104
) -> types.CodeType: ...
105105
def get_code(self, fullname: str) -> types.CodeType | None: ...
106106

@@ -109,8 +109,8 @@ class FileLoader:
109109
path: str
110110
def __init__(self, fullname: str, path: str) -> None: ...
111111
def get_data(self, path: str) -> bytes: ...
112-
def get_filename(self, name: str | None = None) -> str: ...
113-
def load_module(self, name: str | None = None) -> types.ModuleType: ...
112+
def get_filename(self, fullname: str | None = None) -> str: ...
113+
def load_module(self, fullname: str | None = None) -> types.ModuleType: ...
114114
if sys.version_info >= (3, 10):
115115
def get_resource_reader(self, name: str | None = None) -> importlib.readers.FileReader: ...
116116
else:
@@ -126,7 +126,7 @@ class SourceFileLoader(importlib.abc.FileLoader, FileLoader, importlib.abc.Sourc
126126
def source_to_code( # type: ignore[override] # incompatible with InspectLoader.source_to_code
127127
self,
128128
data: ReadableBuffer | str | _ast.Module | _ast.Expression | _ast.Interactive,
129-
path: ReadableBuffer | StrPath,
129+
path: bytes | StrPath,
130130
*,
131131
_optimize: int = -1,
132132
) -> types.CodeType: ...
@@ -137,7 +137,7 @@ class SourcelessFileLoader(importlib.abc.FileLoader, FileLoader, _LoaderBasics):
137137

138138
class ExtensionFileLoader(FileLoader, _LoaderBasics, importlib.abc.ExecutionLoader):
139139
def __init__(self, name: str, path: str) -> None: ...
140-
def get_filename(self, name: str | None = None) -> str: ...
140+
def get_filename(self, fullname: str | None = None) -> str: ...
141141
def get_source(self, fullname: str) -> None: ...
142142
def create_module(self, spec: ModuleSpec) -> types.ModuleType: ...
143143
def exec_module(self, module: types.ModuleType) -> None: ...

‎mypy/typeshed/stdlib/_typeshed/__init__.pyi‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ class SupportsIter(Protocol[_T_co]):
142142
class SupportsAiter(Protocol[_T_co]):
143143
def __aiter__(self) -> _T_co: ...
144144

145+
class SupportsLen(Protocol):
146+
def __len__(self) -> int: ...
147+
145148
class SupportsLenAndGetItem(Protocol[_T_co]):
146149
def __len__(self) -> int: ...
147150
def __getitem__(self, k: int, /) -> _T_co: ...

‎mypy/typeshed/stdlib/ast.pyi‎

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,10 +1744,20 @@ if sys.version_info < (3, 14):
17441744
_T = _TypeVar("_T", bound=AST)
17451745

17461746
if sys.version_info >= (3, 13):
1747+
@overload
1748+
def parse(
1749+
source: _T,
1750+
filename: str | bytes | os.PathLike[Any] = "<unknown>",
1751+
mode: Literal["exec", "eval", "func_type", "single"] = "exec",
1752+
*,
1753+
type_comments: bool = False,
1754+
feature_version: None | int | tuple[int, int] = None,
1755+
optimize: Literal[-1, 0, 1, 2] = -1,
1756+
) -> _T: ...
17471757
@overload
17481758
def parse(
17491759
source: str | ReadableBuffer,
1750-
filename: str | ReadableBuffer | os.PathLike[Any] = "<unknown>",
1760+
filename: str | bytes | os.PathLike[Any] = "<unknown>",
17511761
mode: Literal["exec"] = "exec",
17521762
*,
17531763
type_comments: bool = False,
@@ -1757,7 +1767,7 @@ if sys.version_info >= (3, 13):
17571767
@overload
17581768
def parse(
17591769
source: str | ReadableBuffer,
1760-
filename: str | ReadableBuffer | os.PathLike[Any],
1770+
filename: str | bytes | os.PathLike[Any],
17611771
mode: Literal["eval"],
17621772
*,
17631773
type_comments: bool = False,
@@ -1767,7 +1777,7 @@ if sys.version_info >= (3, 13):
17671777
@overload
17681778
def parse(
17691779
source: str | ReadableBuffer,
1770-
filename: str | ReadableBuffer | os.PathLike[Any],
1780+
filename: str | bytes | os.PathLike[Any],
17711781
mode: Literal["func_type"],
17721782
*,
17731783
type_comments: bool = False,
@@ -1777,7 +1787,7 @@ if sys.version_info >= (3, 13):
17771787
@overload
17781788
def parse(
17791789
source: str | ReadableBuffer,
1780-
filename: str | ReadableBuffer | os.PathLike[Any],
1790+
filename: str | bytes | os.PathLike[Any],
17811791
mode: Literal["single"],
17821792
*,
17831793
type_comments: bool = False,
@@ -1814,7 +1824,7 @@ if sys.version_info >= (3, 13):
18141824
@overload
18151825
def parse(
18161826
source: str | ReadableBuffer,
1817-
filename: str | ReadableBuffer | os.PathLike[Any] = "<unknown>",
1827+
filename: str | bytes | os.PathLike[Any] = "<unknown>",
18181828
mode: str = "exec",
18191829
*,
18201830
type_comments: bool = False,
@@ -1823,10 +1833,19 @@ if sys.version_info >= (3, 13):
18231833
) -> mod: ...
18241834

18251835
else:
1836+
@overload
1837+
def parse(
1838+
source: _T,
1839+
filename: str | bytes | os.PathLike[Any] = "<unknown>",
1840+
mode: Literal["exec", "eval", "func_type", "single"] = "exec",
1841+
*,
1842+
type_comments: bool = False,
1843+
feature_version: None | int | tuple[int, int] = None,
1844+
) -> _T: ...
18261845
@overload
18271846
def parse(
18281847
source: str | ReadableBuffer,
1829-
filename: str | ReadableBuffer | os.PathLike[Any] = "<unknown>",
1848+
filename: str | bytes | os.PathLike[Any] = "<unknown>",
18301849
mode: Literal["exec"] = "exec",
18311850
*,
18321851
type_comments: bool = False,
@@ -1835,7 +1854,7 @@ else:
18351854
@overload
18361855
def parse(
18371856
source: str | ReadableBuffer,
1838-
filename: str | ReadableBuffer | os.PathLike[Any],
1857+
filename: str | bytes | os.PathLike[Any],
18391858
mode: Literal["eval"],
18401859
*,
18411860
type_comments: bool = False,
@@ -1844,7 +1863,7 @@ else:
18441863
@overload
18451864
def parse(
18461865
source: str | ReadableBuffer,
1847-
filename: str | ReadableBuffer | os.PathLike[Any],
1866+
filename: str | bytes | os.PathLike[Any],
18481867
mode: Literal["func_type"],
18491868
*,
18501869
type_comments: bool = False,
@@ -1853,7 +1872,7 @@ else:
18531872
@overload
18541873
def parse(
18551874
source: str | ReadableBuffer,
1856-
filename: str | ReadableBuffer | os.PathLike[Any],
1875+
filename: str | bytes | os.PathLike[Any],
18571876
mode: Literal["single"],
18581877
*,
18591878
type_comments: bool = False,
@@ -1886,7 +1905,7 @@ else:
18861905
@overload
18871906
def parse(
18881907
source: str | ReadableBuffer,
1889-
filename: str | ReadableBuffer | os.PathLike[Any] = "<unknown>",
1908+
filename: str | bytes | os.PathLike[Any] = "<unknown>",
18901909
mode: str = "exec",
18911910
*,
18921911
type_comments: bool = False,

0 commit comments

Comments
 (0)