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

Skip to content

Commit 52c7735

Browse files
cdce8pcdce8p
authored
Sync typeshed (#18683)
Source commit: python/typeshed@cc8ca93 Partially revert python/typeshed#13450 to fix mypyc runs.
1 parent 8104d01 commit 52c7735

29 files changed

+272
-202
lines changed

‎misc/typeshed_patches/0001-Partially-revert-Clean-up-argparse-hacks.patch‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
From b5f2cc9633f9f6cd9326eee96a32efb3aff70701 Mon Sep 17 00:00:00 2001
2+
From: Marc Mueller <[email protected]>
3+
Date: Sat, 15 Feb 2025 20:11:06 +0100
4+
Subject: [PATCH] Partially revert Clean up argparse hacks
5+
6+
---
7+
mypy/typeshed/stdlib/argparse.pyi | 8 +++++---
8+
1 file changed, 5 insertions(+), 3 deletions(-)
9+
10+
diff --git a/mypy/typeshed/stdlib/argparse.pyi b/mypy/typeshed/stdlib/argparse.pyi
11+
index 029bfeefe..9dbd8c308 100644
12+
--- a/mypy/typeshed/stdlib/argparse.pyi
13+
+++ b/mypy/typeshed/stdlib/argparse.pyi
14+
@@ -2,7 +2,7 @@ import sys
15+
from _typeshed import SupportsWrite, sentinel
16+
from collections.abc import Callable, Generator, Iterable, Sequence
17+
from re import Pattern
18+
-from typing import IO, Any, ClassVar, Final, Generic, NoReturn, Protocol, TypeVar, overload
19+
+from typing import IO, Any, ClassVar, Final, Generic, NewType, NoReturn, Protocol, TypeVar, overload
20+
from typing_extensions import Self, TypeAlias, deprecated
21+
22+
__all__ = [
23+
@@ -38,7 +38,9 @@ ONE_OR_MORE: Final = "+"
24+
OPTIONAL: Final = "?"
25+
PARSER: Final = "A..."
26+
REMAINDER: Final = "..."
27+
-SUPPRESS: Final = "==SUPPRESS=="
28+
+_SUPPRESS_T = NewType("_SUPPRESS_T", str)
29+
+SUPPRESS: _SUPPRESS_T | str # not using Literal because argparse sometimes compares SUPPRESS with is
30+
+# the | str is there so that foo = argparse.SUPPRESS; foo = "test" checks out in mypy
31+
ZERO_OR_MORE: Final = "*"
32+
_UNRECOGNIZED_ARGS_ATTR: Final = "_unrecognized_args" # undocumented
33+
34+
@@ -81,7 +83,7 @@ class _ActionsContainer:
35+
# more precisely, Literal["?", "*", "+", "...", "A...", "==SUPPRESS=="],
36+
# but using this would make it hard to annotate callers that don't use a
37+
# literal argument and for subclasses to override this method.
38+
- nargs: int | str | None = None,
39+
+ nargs: int | str | _SUPPRESS_T | None = None,
40+
const: Any = ...,
41+
default: Any = ...,
42+
type: _ActionType = ...,
43+
--
44+
2.48.1
45+

‎mypy/typeshed/stdlib/_decimal.pyi‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ _TrapType: TypeAlias = type[DecimalException]
2727
__version__: Final[str]
2828
__libmpdec_version__: Final[str]
2929

30-
ROUND_DOWN: Final[str]
31-
ROUND_HALF_UP: Final[str]
32-
ROUND_HALF_EVEN: Final[str]
33-
ROUND_CEILING: Final[str]
34-
ROUND_FLOOR: Final[str]
35-
ROUND_UP: Final[str]
36-
ROUND_HALF_DOWN: Final[str]
37-
ROUND_05UP: Final[str]
30+
ROUND_DOWN: Final = "ROUND_DOWN"
31+
ROUND_HALF_UP: Final = "ROUND_HALF_UP"
32+
ROUND_HALF_EVEN: Final = "ROUND_HALF_EVEN"
33+
ROUND_CEILING: Final = "ROUND_CEILING"
34+
ROUND_FLOOR: Final = "ROUND_FLOOR"
35+
ROUND_UP: Final = "ROUND_UP"
36+
ROUND_HALF_DOWN: Final = "ROUND_HALF_DOWN"
37+
ROUND_05UP: Final = "ROUND_05UP"
3838
HAVE_CONTEXTVAR: Final[bool]
3939
HAVE_THREADS: Final[bool]
4040
MAX_EMAX: Final[int]

‎mypy/typeshed/stdlib/_socket.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ if sys.platform == "win32":
7878
SO_EXCLUSIVEADDRUSE: int
7979
if sys.platform != "win32":
8080
SO_REUSEPORT: int
81-
if sys.platform != "darwin" or sys.version_info >= (3, 13):
81+
if sys.platform != "darwin":
8282
SO_BINDTODEVICE: int
8383

8484
if sys.platform != "win32" and sys.platform != "darwin":

‎mypy/typeshed/stdlib/argparse.pyi‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@ _ActionT = TypeVar("_ActionT", bound=Action)
3333
_ArgumentParserT = TypeVar("_ArgumentParserT", bound=ArgumentParser)
3434
_N = TypeVar("_N")
3535
_ActionType: TypeAlias = Callable[[str], Any] | FileType | str
36-
# more precisely, Literal["store", "store_const", "store_true",
37-
# "store_false", "append", "append_const", "count", "help", "version",
38-
# "extend"], but using this would make it hard to annotate callers
39-
# that don't use a literal argument
40-
_ActionStr: TypeAlias = str
41-
# more precisely, Literal["?", "*", "+", "...", "A...",
42-
# "==SUPPRESS=="], but using this would make it hard to annotate
43-
# callers that don't use a literal argument
44-
_NArgsStr: TypeAlias = str
4536

4637
ONE_OR_MORE: Final = "+"
4738
OPTIONAL: Final = "?"
@@ -51,7 +42,7 @@ _SUPPRESS_T = NewType("_SUPPRESS_T", str)
5142
SUPPRESS: _SUPPRESS_T | str # not using Literal because argparse sometimes compares SUPPRESS with is
5243
# the | str is there so that foo = argparse.SUPPRESS; foo = "test" checks out in mypy
5344
ZERO_OR_MORE: Final = "*"
54-
_UNRECOGNIZED_ARGS_ATTR: Final[str] # undocumented
45+
_UNRECOGNIZED_ARGS_ATTR: Final = "_unrecognized_args" # undocumented
5546

5647
class ArgumentError(Exception):
5748
argument_name: str | None
@@ -86,8 +77,13 @@ class _ActionsContainer:
8677
def add_argument(
8778
self,
8879
*name_or_flags: str,
89-
action: _ActionStr | type[Action] = ...,
90-
nargs: int | _NArgsStr | _SUPPRESS_T | None = None,
80+
# str covers predefined actions ("store_true", "count", etc.)
81+
# and user registered actions via the `register` method.
82+
action: str | type[Action] = ...,
83+
# more precisely, Literal["?", "*", "+", "...", "A...", "==SUPPRESS=="],
84+
# but using this would make it hard to annotate callers that don't use a
85+
# literal argument and for subclasses to override this method.
86+
nargs: int | str | _SUPPRESS_T | None = None,
9187
const: Any = ...,
9288
default: Any = ...,
9389
type: _ActionType = ...,

‎mypy/typeshed/stdlib/asyncio/tasks.pyi‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ if sys.version_info >= (3, 12):
7979
_FutureLike: TypeAlias = Future[_T] | Awaitable[_T]
8080
else:
8181
_FutureLike: TypeAlias = Future[_T] | Generator[Any, None, _T] | Awaitable[_T]
82+
8283
_TaskYieldType: TypeAlias = Future[object] | None
8384

8485
FIRST_COMPLETED = concurrent.futures.FIRST_COMPLETED
@@ -347,7 +348,8 @@ else:
347348
*coros_or_futures: _FutureLike[_T], loop: AbstractEventLoop | None = None, return_exceptions: bool
348349
) -> Future[list[_T | BaseException]]: ...
349350

350-
def run_coroutine_threadsafe(coro: _FutureLike[_T], loop: AbstractEventLoop) -> concurrent.futures.Future[_T]: ...
351+
# unlike some asyncio apis, This does strict runtime checking of actually being a coroutine, not of any future-like.
352+
def run_coroutine_threadsafe(coro: Coroutine[Any, Any, _T], loop: AbstractEventLoop) -> concurrent.futures.Future[_T]: ...
351353

352354
if sys.version_info >= (3, 10):
353355
def shield(arg: _FutureLike[_T]) -> Future[_T]: ...

‎mypy/typeshed/stdlib/bdb.pyi‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import sys
22
from _typeshed import ExcInfo, TraceFunction, Unused
3-
from collections.abc import Callable, Iterable, Mapping
3+
from collections.abc import Callable, Iterable, Iterator, Mapping
4+
from contextlib import contextmanager
45
from types import CodeType, FrameType, TracebackType
56
from typing import IO, Any, Final, SupportsInt, TypeVar
67
from typing_extensions import ParamSpec
@@ -30,6 +31,10 @@ class Bdb:
3031
def __init__(self, skip: Iterable[str] | None = None) -> None: ...
3132
def canonic(self, filename: str) -> str: ...
3233
def reset(self) -> None: ...
34+
if sys.version_info >= (3, 12):
35+
@contextmanager
36+
def set_enterframe(self, frame: FrameType) -> Iterator[None]: ...
37+
3338
def trace_dispatch(self, frame: FrameType, event: str, arg: Any) -> TraceFunction: ...
3439
def dispatch_line(self, frame: FrameType) -> TraceFunction: ...
3540
def dispatch_call(self, frame: FrameType, arg: None) -> TraceFunction: ...
@@ -73,7 +78,7 @@ class Bdb:
7378
def get_file_breaks(self, filename: str) -> list[Breakpoint]: ...
7479
def get_all_breaks(self) -> list[Breakpoint]: ...
7580
def get_stack(self, f: FrameType | None, t: TracebackType | None) -> tuple[list[tuple[FrameType, int]], int]: ...
76-
def format_stack_entry(self, frame_lineno: int, lprefix: str = ": ") -> str: ...
81+
def format_stack_entry(self, frame_lineno: tuple[FrameType, int], lprefix: str = ": ") -> str: ...
7782
def run(
7883
self, cmd: str | CodeType, globals: dict[str, Any] | None = None, locals: Mapping[str, Any] | None = None
7984
) -> None: ...

‎mypy/typeshed/stdlib/builtins.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ def ascii(obj: object, /) -> str: ...
11971197
def bin(number: int | SupportsIndex, /) -> str: ...
11981198
def breakpoint(*args: Any, **kws: Any) -> None: ...
11991199
def callable(obj: object, /) -> TypeIs[Callable[..., object]]: ...
1200-
def chr(i: int, /) -> str: ...
1200+
def chr(i: int | SupportsIndex, /) -> str: ...
12011201

12021202
# We define this here instead of using os.PathLike to avoid import cycle issues.
12031203
# See https://github.com/python/typeshed/pull/991#issuecomment-288160993

‎mypy/typeshed/stdlib/cmath.pyi‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
from typing import SupportsComplex, SupportsFloat, SupportsIndex
1+
from typing import Final, SupportsComplex, SupportsFloat, SupportsIndex
22
from typing_extensions import TypeAlias
33

4-
e: float
5-
pi: float
6-
inf: float
7-
infj: complex
8-
nan: float
9-
nanj: complex
10-
tau: float
4+
e: Final[float]
5+
pi: Final[float]
6+
inf: Final[float]
7+
infj: Final[complex]
8+
nan: Final[float]
9+
nanj: Final[complex]
10+
tau: Final[float]
1111

1212
_C: TypeAlias = SupportsFloat | SupportsComplex | SupportsIndex | complex
1313

‎mypy/typeshed/stdlib/decimal.pyi‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class Underflow(Inexact, Rounded, Subnormal): ...
6565
class FloatOperation(DecimalException, TypeError): ...
6666

6767
class Decimal:
68-
def __new__(cls, value: _DecimalNew = ..., context: Context | None = ...) -> Self: ...
68+
def __new__(cls, value: _DecimalNew = "0", context: Context | None = None) -> Self: ...
6969
@classmethod
7070
def from_float(cls, f: float, /) -> Self: ...
7171
def __bool__(self) -> bool: ...
@@ -163,12 +163,12 @@ class Decimal:
163163
def __reduce__(self) -> tuple[type[Self], tuple[str]]: ...
164164
def __copy__(self) -> Self: ...
165165
def __deepcopy__(self, memo: Any, /) -> Self: ...
166-
def __format__(self, specifier: str, context: Context | None = ..., /) -> str: ...
166+
def __format__(self, specifier: str, context: Context | None = None, /) -> str: ...
167167

168168
class Context:
169169
# TODO: Context doesn't allow you to delete *any* attributes from instances of the class at runtime,
170170
# even settable attributes like `prec` and `rounding`,
171-
# but that's inexpressable in the stub.
171+
# but that's inexpressible in the stub.
172172
# Type checkers either ignore it or misinterpret it
173173
# if you add a `def __delattr__(self, name: str, /) -> NoReturn` method to the stub
174174
prec: int
@@ -181,14 +181,14 @@ class Context:
181181
flags: dict[_TrapType, bool]
182182
def __init__(
183183
self,
184-
prec: int | None = ...,
185-
rounding: str | None = ...,
186-
Emin: int | None = ...,
187-
Emax: int | None = ...,
188-
capitals: int | None = ...,
189-
clamp: int | None = ...,
190-
flags: None | dict[_TrapType, bool] | Container[_TrapType] = ...,
191-
traps: None | dict[_TrapType, bool] | Container[_TrapType] = ...,
184+
prec: int | None = None,
185+
rounding: str | None = None,
186+
Emin: int | None = None,
187+
Emax: int | None = None,
188+
capitals: int | None = None,
189+
clamp: int | None = None,
190+
flags: dict[_TrapType, bool] | Container[_TrapType] | None = None,
191+
traps: dict[_TrapType, bool] | Container[_TrapType] | None = None,
192192
) -> None: ...
193193
def __reduce__(self) -> tuple[type[Self], tuple[Any, ...]]: ...
194194
def clear_flags(self) -> None: ...

‎mypy/typeshed/stdlib/email/_header_value_parser.pyi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import sys
12
from collections.abc import Iterable, Iterator
23
from email.errors import HeaderParseError, MessageDefect
34
from email.policy import Policy
@@ -21,6 +22,9 @@ NLSET: Final[set[str]]
2122
# Added in Python 3.8.20, 3.9.20, 3.10.15, 3.11.10, 3.12.5
2223
SPECIALSNL: Final[set[str]]
2324

25+
if sys.version_info >= (3, 12):
26+
def make_quoted_pairs(value: Any) -> str: ...
27+
2428
def quote_string(value: Any) -> str: ...
2529

2630
rfc2047_matcher: Pattern[str]

0 commit comments

Comments
 (0)