Skip to content

Commit 28d57b1

Browse files
hauntsaninjahauntsaninja
authored
Sync typeshed (#11416)
Source commit: python/typeshed@151f256 Co-authored-by: hauntsaninja <>
1 parent 3d82f6f commit 28d57b1

File tree

180 files changed

+1350
-1194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+1350
-1194
lines changed

‎mypy/typeshed/stdlib/@python2/__builtin__.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ def min(__iterable: Iterable[_T], *, key: Callable[[_T], Any] = ...) -> _T: ...
952952
@overload
953953
def next(__i: Iterator[_T]) -> _T: ...
954954
@overload
955-
def next(__i: Iterator[_T], default: _VT) -> _T | _VT: ...
955+
def next(__i: Iterator[_T], __default: _VT) -> _T | _VT: ...
956956
def oct(__number: int | _SupportsIndex) -> str: ...
957957
def open(name: unicode | int, mode: unicode = ..., buffering: int = ...) -> BinaryIO: ...
958958
def ord(__c: Text | bytes) -> int: ...

‎mypy/typeshed/stdlib/@python2/builtins.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ def min(__iterable: Iterable[_T], *, key: Callable[[_T], Any] = ...) -> _T: ...
952952
@overload
953953
def next(__i: Iterator[_T]) -> _T: ...
954954
@overload
955-
def next(__i: Iterator[_T], default: _VT) -> _T | _VT: ...
955+
def next(__i: Iterator[_T], __default: _VT) -> _T | _VT: ...
956956
def oct(__number: int | _SupportsIndex) -> str: ...
957957
def open(name: unicode | int, mode: unicode = ..., buffering: int = ...) -> BinaryIO: ...
958958
def ord(__c: Text | bytes) -> int: ...

‎mypy/typeshed/stdlib/@python2/sqlite3/dbapi2.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class Cursor(Iterator[Any]):
135135
description: Any
136136
lastrowid: Any
137137
row_factory: Any
138-
rowcount: Any
138+
rowcount: int
139139
# TODO: Cursor class accepts exactly 1 argument
140140
# required type is sqlite3.Connection (which is imported as _Connection)
141141
# however, the name of the __init__ variable is unknown

‎mypy/typeshed/stdlib/_codecs.pyi‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,51 +16,51 @@ def lookup_error(__name: str) -> _Handler: ...
1616
def decode(obj: Any, encoding: str = ..., errors: str | None = ...) -> Any: ...
1717
def encode(obj: Any, encoding: str = ..., errors: str | None = ...) -> Any: ...
1818
def charmap_build(__map: str) -> _MapT: ...
19-
def ascii_decode(__data: bytes, __errors: str | None = ...) -> Tuple[str, int]: ...
20-
def ascii_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
21-
def charmap_decode(__data: bytes, __errors: str | None = ..., __mapping: _MapT | None = ...) -> Tuple[str, int]: ...
22-
def charmap_encode(__str: str, __errors: str | None = ..., __mapping: _MapT | None = ...) -> Tuple[bytes, int]: ...
23-
def escape_decode(__data: str | bytes, __errors: str | None = ...) -> Tuple[str, int]: ...
24-
def escape_encode(__data: bytes, __errors: str | None = ...) -> Tuple[bytes, int]: ...
25-
def latin_1_decode(__data: bytes, __errors: str | None = ...) -> Tuple[str, int]: ...
26-
def latin_1_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
27-
def raw_unicode_escape_decode(__data: str | bytes, __errors: str | None = ...) -> Tuple[str, int]: ...
28-
def raw_unicode_escape_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
29-
def readbuffer_encode(__data: str | bytes, __errors: str | None = ...) -> Tuple[bytes, int]: ...
30-
def unicode_escape_decode(__data: str | bytes, __errors: str | None = ...) -> Tuple[str, int]: ...
31-
def unicode_escape_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
19+
def ascii_decode(__data: bytes, __errors: str | None = ...) -> tuple[str, int]: ...
20+
def ascii_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
21+
def charmap_decode(__data: bytes, __errors: str | None = ..., __mapping: _MapT | None = ...) -> tuple[str, int]: ...
22+
def charmap_encode(__str: str, __errors: str | None = ..., __mapping: _MapT | None = ...) -> tuple[bytes, int]: ...
23+
def escape_decode(__data: str | bytes, __errors: str | None = ...) -> tuple[str, int]: ...
24+
def escape_encode(__data: bytes, __errors: str | None = ...) -> tuple[bytes, int]: ...
25+
def latin_1_decode(__data: bytes, __errors: str | None = ...) -> tuple[str, int]: ...
26+
def latin_1_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
27+
def raw_unicode_escape_decode(__data: str | bytes, __errors: str | None = ...) -> tuple[str, int]: ...
28+
def raw_unicode_escape_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
29+
def readbuffer_encode(__data: str | bytes, __errors: str | None = ...) -> tuple[bytes, int]: ...
30+
def unicode_escape_decode(__data: str | bytes, __errors: str | None = ...) -> tuple[str, int]: ...
31+
def unicode_escape_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
3232

3333
if sys.version_info < (3, 8):
34-
def unicode_internal_decode(__obj: str | bytes, __errors: str | None = ...) -> Tuple[str, int]: ...
35-
def unicode_internal_encode(__obj: str | bytes, __errors: str | None = ...) -> Tuple[bytes, int]: ...
34+
def unicode_internal_decode(__obj: str | bytes, __errors: str | None = ...) -> tuple[str, int]: ...
35+
def unicode_internal_encode(__obj: str | bytes, __errors: str | None = ...) -> tuple[bytes, int]: ...
3636

37-
def utf_16_be_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> Tuple[str, int]: ...
38-
def utf_16_be_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
39-
def utf_16_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> Tuple[str, int]: ...
40-
def utf_16_encode(__str: str, __errors: str | None = ..., __byteorder: int = ...) -> Tuple[bytes, int]: ...
37+
def utf_16_be_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> tuple[str, int]: ...
38+
def utf_16_be_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
39+
def utf_16_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> tuple[str, int]: ...
40+
def utf_16_encode(__str: str, __errors: str | None = ..., __byteorder: int = ...) -> tuple[bytes, int]: ...
4141
def utf_16_ex_decode(
4242
__data: bytes, __errors: str | None = ..., __byteorder: int = ..., __final: int = ...
43-
) -> Tuple[str, int, int]: ...
44-
def utf_16_le_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> Tuple[str, int]: ...
45-
def utf_16_le_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
46-
def utf_32_be_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> Tuple[str, int]: ...
47-
def utf_32_be_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
48-
def utf_32_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> Tuple[str, int]: ...
49-
def utf_32_encode(__str: str, __errors: str | None = ..., __byteorder: int = ...) -> Tuple[bytes, int]: ...
43+
) -> tuple[str, int, int]: ...
44+
def utf_16_le_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> tuple[str, int]: ...
45+
def utf_16_le_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
46+
def utf_32_be_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> tuple[str, int]: ...
47+
def utf_32_be_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
48+
def utf_32_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> tuple[str, int]: ...
49+
def utf_32_encode(__str: str, __errors: str | None = ..., __byteorder: int = ...) -> tuple[bytes, int]: ...
5050
def utf_32_ex_decode(
5151
__data: bytes, __errors: str | None = ..., __byteorder: int = ..., __final: int = ...
52-
) -> Tuple[str, int, int]: ...
53-
def utf_32_le_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> Tuple[str, int]: ...
54-
def utf_32_le_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
55-
def utf_7_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> Tuple[str, int]: ...
56-
def utf_7_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
57-
def utf_8_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> Tuple[str, int]: ...
58-
def utf_8_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
52+
) -> tuple[str, int, int]: ...
53+
def utf_32_le_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> tuple[str, int]: ...
54+
def utf_32_le_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
55+
def utf_7_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> tuple[str, int]: ...
56+
def utf_7_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
57+
def utf_8_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> tuple[str, int]: ...
58+
def utf_8_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
5959

6060
if sys.platform == "win32":
61-
def mbcs_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> Tuple[str, int]: ...
62-
def mbcs_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
63-
def code_page_decode(__codepage: int, __data: bytes, __errors: str | None = ..., __final: int = ...) -> Tuple[str, int]: ...
64-
def code_page_encode(__code_page: int, __str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
65-
def oem_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> Tuple[str, int]: ...
66-
def oem_encode(__str: str, __errors: str | None = ...) -> Tuple[bytes, int]: ...
61+
def mbcs_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> tuple[str, int]: ...
62+
def mbcs_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
63+
def code_page_decode(__codepage: int, __data: bytes, __errors: str | None = ..., __final: int = ...) -> tuple[str, int]: ...
64+
def code_page_encode(__code_page: int, __str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...
65+
def oem_decode(__data: bytes, __errors: str | None = ..., __final: int = ...) -> tuple[str, int]: ...
66+
def oem_encode(__str: str, __errors: str | None = ...) -> tuple[bytes, int]: ...

‎mypy/typeshed/stdlib/_compat_pickle.pyi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from typing import Tuple
22

33
IMPORT_MAPPING: dict[str, str]
4-
NAME_MAPPING: dict[Tuple[str, str], Tuple[str, str]]
4+
NAME_MAPPING: dict[tuple[str, str], tuple[str, str]]
55
PYTHON2_EXCEPTIONS: Tuple[str, ...]
66
MULTIPROCESSING_EXCEPTIONS: Tuple[str, ...]
77
REVERSE_IMPORT_MAPPING: dict[str, str]
8-
REVERSE_NAME_MAPPING: dict[Tuple[str, str], Tuple[str, str]]
8+
REVERSE_NAME_MAPPING: dict[tuple[str, str], tuple[str, str]]
99
PYTHON3_OSERROR_EXCEPTIONS: Tuple[str, ...]
1010
PYTHON3_IMPORTERROR_EXCEPTIONS: Tuple[str, ...]

‎mypy/typeshed/stdlib/_curses.pyi‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import sys
2-
from typing import IO, Any, BinaryIO, NamedTuple, Tuple, Union, overload
2+
from typing import IO, Any, BinaryIO, NamedTuple, Union, overload
33

44
_chtype = Union[str, bytes, int]
55

@@ -273,7 +273,7 @@ def baudrate() -> int: ...
273273
def beep() -> None: ...
274274
def can_change_color() -> bool: ...
275275
def cbreak(__flag: bool = ...) -> None: ...
276-
def color_content(__color_number: int) -> Tuple[int, int, int]: ...
276+
def color_content(__color_number: int) -> tuple[int, int, int]: ...
277277

278278
# Changed in Python 3.8.8 and 3.9.2
279279
if sys.version_info >= (3, 8):
@@ -293,8 +293,8 @@ def erasechar() -> bytes: ...
293293
def filter() -> None: ...
294294
def flash() -> None: ...
295295
def flushinp() -> None: ...
296-
def getmouse() -> Tuple[int, int, int, int, int]: ...
297-
def getsyx() -> Tuple[int, int]: ...
296+
def getmouse() -> tuple[int, int, int, int, int]: ...
297+
def getsyx() -> tuple[int, int]: ...
298298
def getwin(__file: BinaryIO) -> _CursesWindow: ...
299299
def halfdelay(__tenths: int) -> None: ...
300300
def has_colors() -> bool: ...
@@ -316,7 +316,7 @@ def killchar() -> bytes: ...
316316
def longname() -> bytes: ...
317317
def meta(__yes: bool) -> None: ...
318318
def mouseinterval(__interval: int) -> None: ...
319-
def mousemask(__newmask: int) -> Tuple[int, int]: ...
319+
def mousemask(__newmask: int) -> tuple[int, int]: ...
320320
def napms(__ms: int) -> int: ...
321321
def newpad(__nlines: int, __ncols: int) -> _CursesWindow: ...
322322
def newwin(__nlines: int, __ncols: int, __begin_y: int = ..., __begin_x: int = ...) -> _CursesWindow: ...
@@ -326,7 +326,7 @@ def noecho() -> None: ...
326326
def nonl() -> None: ...
327327
def noqiflush() -> None: ...
328328
def noraw() -> None: ...
329-
def pair_content(__pair_number: int) -> Tuple[int, int]: ...
329+
def pair_content(__pair_number: int) -> tuple[int, int]: ...
330330
def pair_number(__attr: int) -> int: ...
331331
def putp(__string: bytes) -> None: ...
332332
def qiflush(__flag: bool = ...) -> None: ...
@@ -427,8 +427,8 @@ class _CursesWindow:
427427
def echochar(self, __ch: _chtype, __attr: int = ...) -> None: ...
428428
def enclose(self, __y: int, __x: int) -> bool: ...
429429
def erase(self) -> None: ...
430-
def getbegyx(self) -> Tuple[int, int]: ...
431-
def getbkgd(self) -> Tuple[int, int]: ...
430+
def getbegyx(self) -> tuple[int, int]: ...
431+
def getbkgd(self) -> tuple[int, int]: ...
432432
@overload
433433
def getch(self) -> int: ...
434434
@overload
@@ -441,8 +441,8 @@ class _CursesWindow:
441441
def getkey(self) -> str: ...
442442
@overload
443443
def getkey(self, y: int, x: int) -> str: ...
444-
def getmaxyx(self) -> Tuple[int, int]: ...
445-
def getparyx(self) -> Tuple[int, int]: ...
444+
def getmaxyx(self) -> tuple[int, int]: ...
445+
def getparyx(self) -> tuple[int, int]: ...
446446
@overload
447447
def getstr(self) -> _chtype: ...
448448
@overload
@@ -451,7 +451,7 @@ class _CursesWindow:
451451
def getstr(self, y: int, x: int) -> _chtype: ...
452452
@overload
453453
def getstr(self, y: int, x: int, n: int) -> _chtype: ...
454-
def getyx(self) -> Tuple[int, int]: ...
454+
def getyx(self) -> tuple[int, int]: ...
455455
@overload
456456
def hline(self, ch: _chtype, n: int) -> None: ...
457457
@overload

‎mypy/typeshed/stdlib/_json.pyi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Any, Callable, Tuple
1+
from typing import Any, Callable
22

33
class make_encoder:
44
sort_keys: Any
@@ -32,7 +32,7 @@ class make_scanner:
3232
strict: bool
3333
# TODO: 'context' needs the attrs above (ducktype), but not __call__.
3434
def __init__(self, context: make_scanner) -> None: ...
35-
def __call__(self, string: str, index: int) -> Tuple[Any, int]: ...
35+
def __call__(self, string: str, index: int) -> tuple[Any, int]: ...
3636

3737
def encode_basestring_ascii(s: str) -> str: ...
38-
def scanstring(string: str, end: int, strict: bool = ...) -> Tuple[str, int]: ...
38+
def scanstring(string: str, end: int, strict: bool = ...) -> tuple[str, int]: ...

‎mypy/typeshed/stdlib/_markupbase.pyi‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
from typing import Tuple
2-
31
class ParserBase:
42
def __init__(self) -> None: ...
53
def error(self, message: str) -> None: ...
64
def reset(self) -> None: ...
7-
def getpos(self) -> Tuple[int, int]: ...
5+
def getpos(self) -> tuple[int, int]: ...
86
def unknown_decl(self, data: str) -> None: ...

‎mypy/typeshed/stdlib/_osx_support.pyi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ def customize_config_vars(_config_vars: dict[str, str]) -> dict[str, str]: ...
3030
def customize_compiler(_config_vars: dict[str, str]) -> dict[str, str]: ...
3131
def get_platform_osx(
3232
_config_vars: dict[str, str], osname: _T, release: _K, machine: _V
33-
) -> Tuple[str | _T, str | _K, str | _V]: ...
33+
) -> tuple[str | _T, str | _K, str | _V]: ...

‎mypy/typeshed/stdlib/_posixsubprocess.pyi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# NOTE: These are incomplete!
22

3-
from typing import Callable, Sequence, Tuple
3+
from typing import Callable, Sequence
44

5-
def cloexec_pipe() -> Tuple[int, int]: ...
5+
def cloexec_pipe() -> tuple[int, int]: ...
66
def fork_exec(
77
args: Sequence[str],
88
executable_list: Sequence[bytes],

0 commit comments

Comments
 (0)