Skip to content

Commit 484c014

Browse files
hauntsaninjahauntsaninja
authored
Suffix T to type variable names (#4898)
* _MessageType to _MessageT * _default to _T * _TConnection to _ConnectionT, _TListener to _ListenerT * _Number to _NumberT * _MessageVar to _MessageT * _Type to _TypeT * _ArgType to _T * _Ch to _CharT Co-authored-by: hauntsaninja <>
1 parent bc1fe54 commit 484c014

File tree

9 files changed

+62
-62
lines changed

9 files changed

+62
-62
lines changed

‎stdlib/2/copy_reg.pyi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
from typing import Any, Callable, Hashable, List, Optional, SupportsInt, Tuple, TypeVar, Union
22

3-
_Type = TypeVar("_Type", bound=type)
4-
_Reduce = Union[Tuple[Callable[..., _Type], Tuple[Any, ...]], Tuple[Callable[..., _Type], Tuple[Any, ...], Optional[Any]]]
3+
_TypeT = TypeVar("_TypeT", bound=type)
4+
_Reduce = Union[Tuple[Callable[..., _TypeT], Tuple[Any, ...]], Tuple[Callable[..., _TypeT], Tuple[Any, ...], Optional[Any]]]
55

66
__all__: List[str]
77

88
def pickle(
9-
ob_type: _Type,
10-
pickle_function: Callable[[_Type], Union[str, _Reduce[_Type]]],
11-
constructor_ob: Optional[Callable[[_Reduce[_Type]], _Type]] = ...,
9+
ob_type: _TypeT,
10+
pickle_function: Callable[[_TypeT], Union[str, _Reduce[_TypeT]]],
11+
constructor_ob: Optional[Callable[[_Reduce[_TypeT]], _TypeT]] = ...,
1212
) -> None: ...
13-
def constructor(object: Callable[[_Reduce[_Type]], _Type]) -> None: ...
13+
def constructor(object: Callable[[_Reduce[_TypeT]], _TypeT]) -> None: ...
1414
def add_extension(module: Hashable, name: Hashable, code: SupportsInt) -> None: ...
1515
def remove_extension(module: Hashable, name: Hashable, code: int) -> None: ...
1616
def clear_extension_cache() -> None: ...

‎stdlib/2/mutex.pyi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from typing import Any, Callable, Deque, TypeVar
22

3-
_ArgType = TypeVar("_ArgType")
3+
_T = TypeVar("_T")
44

55
class mutex:
66
locked: bool
77
queue: Deque[Any]
88
def __init__(self) -> None: ...
99
def test(self) -> bool: ...
1010
def testandset(self) -> bool: ...
11-
def lock(self, function: Callable[[_ArgType], Any], argument: _ArgType) -> None: ...
11+
def lock(self, function: Callable[[_T], Any], argument: _T) -> None: ...
1212
def unlock(self) -> None: ...

‎stdlib/2and3/curses/ascii.pyi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import List, TypeVar, Union
22

3-
_Ch = TypeVar("_Ch", str, int)
3+
_CharT = TypeVar("_CharT", str, int)
44

55
NUL: int
66
SOH: int
@@ -56,7 +56,7 @@ def isupper(c: Union[str, int]) -> bool: ...
5656
def isxdigit(c: Union[str, int]) -> bool: ...
5757
def isctrl(c: Union[str, int]) -> bool: ...
5858
def ismeta(c: Union[str, int]) -> bool: ...
59-
def ascii(c: _Ch) -> _Ch: ...
60-
def ctrl(c: _Ch) -> _Ch: ...
61-
def alt(c: _Ch) -> _Ch: ...
59+
def ascii(c: _CharT) -> _CharT: ...
60+
def ctrl(c: _CharT) -> _CharT: ...
61+
def alt(c: _CharT) -> _CharT: ...
6262
def unctrl(c: Union[str, int]) -> str: ...

‎stdlib/2and3/mailbox.pyi‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if sys.version_info >= (3, 9):
2929
from types import GenericAlias
3030

3131
_T = TypeVar("_T")
32-
_MessageType = TypeVar("_MessageType", bound=Message)
32+
_MessageT = TypeVar("_MessageT", bound=Message)
3333
_MessageData = Union[email.message.Message, bytes, str, IO[str], IO[bytes]]
3434

3535
class _HasIteritems(Protocol):
@@ -40,41 +40,41 @@ class _HasItems(Protocol):
4040

4141
linesep: bytes
4242

43-
class Mailbox(Generic[_MessageType]):
43+
class Mailbox(Generic[_MessageT]):
4444

4545
_path: Union[bytes, str] # undocumented
46-
_factory: Optional[Callable[[IO[Any]], _MessageType]] # undocumented
47-
def __init__(self, path: AnyPath, factory: Optional[Callable[[IO[Any]], _MessageType]] = ..., create: bool = ...) -> None: ...
46+
_factory: Optional[Callable[[IO[Any]], _MessageT]] # undocumented
47+
def __init__(self, path: AnyPath, factory: Optional[Callable[[IO[Any]], _MessageT]] = ..., create: bool = ...) -> None: ...
4848
def add(self, message: _MessageData) -> str: ...
4949
def remove(self, key: str) -> None: ...
5050
def __delitem__(self, key: str) -> None: ...
5151
def discard(self, key: str) -> None: ...
5252
def __setitem__(self, key: str, message: _MessageData) -> None: ...
5353
@overload
54-
def get(self, key: str, default: None = ...) -> Optional[_MessageType]: ...
54+
def get(self, key: str, default: None = ...) -> Optional[_MessageT]: ...
5555
@overload
56-
def get(self, key: str, default: _T) -> Union[_MessageType, _T]: ...
57-
def __getitem__(self, key: str) -> _MessageType: ...
58-
def get_message(self, key: str) -> _MessageType: ...
56+
def get(self, key: str, default: _T) -> Union[_MessageT, _T]: ...
57+
def __getitem__(self, key: str) -> _MessageT: ...
58+
def get_message(self, key: str) -> _MessageT: ...
5959
def get_string(self, key: str) -> str: ...
6060
def get_bytes(self, key: str) -> bytes: ...
6161
# As '_ProxyFile' doesn't implement the full IO spec, and BytesIO is incompatible with it, get_file return is Any here
6262
def get_file(self, key: str) -> Any: ...
6363
def iterkeys(self) -> Iterator[str]: ...
6464
def keys(self) -> List[str]: ...
65-
def itervalues(self) -> Iterator[_MessageType]: ...
66-
def __iter__(self) -> Iterator[_MessageType]: ...
67-
def values(self) -> List[_MessageType]: ...
68-
def iteritems(self) -> Iterator[Tuple[str, _MessageType]]: ...
69-
def items(self) -> List[Tuple[str, _MessageType]]: ...
65+
def itervalues(self) -> Iterator[_MessageT]: ...
66+
def __iter__(self) -> Iterator[_MessageT]: ...
67+
def values(self) -> List[_MessageT]: ...
68+
def iteritems(self) -> Iterator[Tuple[str, _MessageT]]: ...
69+
def items(self) -> List[Tuple[str, _MessageT]]: ...
7070
def __contains__(self, key: str) -> bool: ...
7171
def __len__(self) -> int: ...
7272
def clear(self) -> None: ...
7373
@overload
74-
def pop(self, key: str, default: None = ...) -> Optional[_MessageType]: ...
74+
def pop(self, key: str, default: None = ...) -> Optional[_MessageT]: ...
7575
@overload
76-
def pop(self, key: str, default: _T = ...) -> Union[_MessageType, _T]: ...
77-
def popitem(self) -> Tuple[str, _MessageType]: ...
76+
def pop(self, key: str, default: _T = ...) -> Union[_MessageT, _T]: ...
77+
def popitem(self) -> Tuple[str, _MessageT]: ...
7878
def update(self, arg: Optional[Union[_HasIteritems, _HasItems, Iterable[Tuple[str, _MessageData]]]] = ...) -> None: ...
7979
def flush(self) -> None: ...
8080
def lock(self) -> None: ...
@@ -97,9 +97,9 @@ class Maildir(Mailbox[MaildirMessage]):
9797
def clean(self) -> None: ...
9898
def next(self) -> Optional[str]: ...
9999

100-
class _singlefileMailbox(Mailbox[_MessageType]): ...
100+
class _singlefileMailbox(Mailbox[_MessageT]): ...
101101

102-
class _mboxMMDF(_singlefileMailbox[_MessageType]):
102+
class _mboxMMDF(_singlefileMailbox[_MessageT]):
103103
def get_file(self, key: str) -> _PartialFile[bytes]: ...
104104

105105
class mbox(_mboxMMDF[mboxMessage]):

‎stdlib/2and3/unicodedata.pyi‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ ucd_3_2_0: UCD
55
ucnhash_CAPI: Any
66
unidata_version: str
77

8-
_default = TypeVar("_default")
8+
_T = TypeVar("_T")
99

1010
def bidirectional(__chr: Text) -> Text: ...
1111
def category(__chr: Text) -> Text: ...
1212
def combining(__chr: Text) -> int: ...
13-
def decimal(__chr: Text, __default: _default = ...) -> Union[int, _default]: ...
13+
def decimal(__chr: Text, __default: _T = ...) -> Union[int, _T]: ...
1414
def decomposition(__chr: Text) -> Text: ...
15-
def digit(__chr: Text, __default: _default = ...) -> Union[int, _default]: ...
15+
def digit(__chr: Text, __default: _T = ...) -> Union[int, _T]: ...
1616
def east_asian_width(__chr: Text) -> Text: ...
1717

1818
if sys.version_info >= (3, 8):
1919
def is_normalized(__form: str, __unistr: str) -> bool: ...
2020

2121
def lookup(__name: Union[Text, bytes]) -> Text: ...
2222
def mirrored(__chr: Text) -> int: ...
23-
def name(__chr: Text, __default: _default = ...) -> Union[Text, _default]: ...
23+
def name(__chr: Text, __default: _T = ...) -> Union[Text, _T]: ...
2424
def normalize(__form: Text, __unistr: Text) -> Text: ...
25-
def numeric(__chr: Text, __default: _default = ...) -> Union[float, _default]: ...
25+
def numeric(__chr: Text, __default: _T = ...) -> Union[float, _T]: ...
2626

2727
class UCD(object):
2828
# The methods below are constructed from the same array in C
@@ -31,12 +31,12 @@ class UCD(object):
3131
def bidirectional(self, __chr: Text) -> str: ...
3232
def category(self, __chr: Text) -> str: ...
3333
def combining(self, __chr: Text) -> int: ...
34-
def decimal(self, __chr: Text, __default: _default = ...) -> Union[int, _default]: ...
34+
def decimal(self, __chr: Text, __default: _T = ...) -> Union[int, _T]: ...
3535
def decomposition(self, __chr: Text) -> str: ...
36-
def digit(self, __chr: Text, __default: _default = ...) -> Union[int, _default]: ...
36+
def digit(self, __chr: Text, __default: _T = ...) -> Union[int, _T]: ...
3737
def east_asian_width(self, __chr: Text) -> str: ...
3838
def lookup(self, __name: Union[Text, bytes]) -> Text: ...
3939
def mirrored(self, __chr: Text) -> int: ...
40-
def name(self, __chr: Text, __default: _default = ...) -> Union[Text, _default]: ...
40+
def name(self, __chr: Text, __default: _T = ...) -> Union[Text, _T]: ...
4141
def normalize(self, __form: Text, __unistr: Text) -> Text: ...
42-
def numeric(self, __chr: Text, __default: _default = ...) -> Union[float, _default]: ...
42+
def numeric(self, __chr: Text, __default: _T = ...) -> Union[float, _T]: ...

‎stdlib/3/copyreg.pyi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
from typing import Any, Callable, Hashable, List, Optional, SupportsInt, Tuple, TypeVar, Union
22

3-
_Type = TypeVar("_Type", bound=type)
4-
_Reduce = Union[Tuple[Callable[..., _Type], Tuple[Any, ...]], Tuple[Callable[..., _Type], Tuple[Any, ...], Optional[Any]]]
3+
_TypeT = TypeVar("_TypeT", bound=type)
4+
_Reduce = Union[Tuple[Callable[..., _TypeT], Tuple[Any, ...]], Tuple[Callable[..., _TypeT], Tuple[Any, ...], Optional[Any]]]
55

66
__all__: List[str]
77

88
def pickle(
9-
ob_type: _Type,
10-
pickle_function: Callable[[_Type], Union[str, _Reduce[_Type]]],
11-
constructor_ob: Optional[Callable[[_Reduce[_Type]], _Type]] = ...,
9+
ob_type: _TypeT,
10+
pickle_function: Callable[[_TypeT], Union[str, _Reduce[_TypeT]]],
11+
constructor_ob: Optional[Callable[[_Reduce[_TypeT]], _TypeT]] = ...,
1212
) -> None: ...
13-
def constructor(object: Callable[[_Reduce[_Type]], _Type]) -> None: ...
13+
def constructor(object: Callable[[_Reduce[_TypeT]], _TypeT]) -> None: ...
1414
def add_extension(module: Hashable, name: Hashable, code: SupportsInt) -> None: ...
1515
def remove_extension(module: Hashable, name: Hashable, code: int) -> None: ...
1616
def clear_extension_cache() -> None: ...

‎stdlib/3/multiprocessing/dummy/connection.pyi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ from typing import Any, List, Optional, Tuple, Type, TypeVar, Union
44

55
families: List[None]
66

7-
_TConnection = TypeVar("_TConnection", bound=Connection)
8-
_TListener = TypeVar("_TListener", bound=Listener)
7+
_ConnectionT = TypeVar("_ConnectionT", bound=Connection)
8+
_ListenerT = TypeVar("_ListenerT", bound=Listener)
99
_Address = Union[str, Tuple[str, int]]
1010

1111
class Connection(object):
@@ -15,7 +15,7 @@ class Connection(object):
1515
recv_bytes: Any
1616
send: Any
1717
send_bytes: Any
18-
def __enter__(self: _TConnection) -> _TConnection: ...
18+
def __enter__(self: _ConnectionT) -> _ConnectionT: ...
1919
def __exit__(
2020
self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
2121
) -> None: ...
@@ -27,7 +27,7 @@ class Listener(object):
2727
_backlog_queue: Optional[Queue[Any]]
2828
@property
2929
def address(self) -> Optional[Queue[Any]]: ...
30-
def __enter__(self: _TListener) -> _TListener: ...
30+
def __enter__(self: _ListenerT) -> _ListenerT: ...
3131
def __exit__(
3232
self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
3333
) -> None: ...

‎stdlib/3/statistics.pyi‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ from typing import Any, Hashable, Iterable, List, Optional, SupportsFloat, Type,
66

77
_T = TypeVar("_T")
88
# Most functions in this module accept homogeneous collections of one of these types
9-
_Number = TypeVar("_Number", float, Decimal, Fraction)
9+
_NumberT = TypeVar("_NumberT", float, Decimal, Fraction)
1010

1111
# Used in mode, multimode
1212
_HashableT = TypeVar("_HashableT", bound=Hashable)
@@ -17,25 +17,25 @@ if sys.version_info >= (3, 8):
1717
def fmean(data: Iterable[SupportsFloat]) -> float: ...
1818
def geometric_mean(data: Iterable[SupportsFloat]) -> float: ...
1919

20-
def mean(data: Iterable[_Number]) -> _Number: ...
21-
def harmonic_mean(data: Iterable[_Number]) -> _Number: ...
22-
def median(data: Iterable[_Number]) -> _Number: ...
20+
def mean(data: Iterable[_NumberT]) -> _NumberT: ...
21+
def harmonic_mean(data: Iterable[_NumberT]) -> _NumberT: ...
22+
def median(data: Iterable[_NumberT]) -> _NumberT: ...
2323
def median_low(data: Iterable[SupportsLessThanT]) -> SupportsLessThanT: ...
2424
def median_high(data: Iterable[SupportsLessThanT]) -> SupportsLessThanT: ...
25-
def median_grouped(data: Iterable[_Number], interval: _Number = ...) -> _Number: ...
25+
def median_grouped(data: Iterable[_NumberT], interval: _NumberT = ...) -> _NumberT: ...
2626
def mode(data: Iterable[_HashableT]) -> _HashableT: ...
2727

2828
if sys.version_info >= (3, 8):
2929
def multimode(data: Iterable[_HashableT]) -> List[_HashableT]: ...
3030

31-
def pstdev(data: Iterable[_Number], mu: Optional[_Number] = ...) -> _Number: ...
32-
def pvariance(data: Iterable[_Number], mu: Optional[_Number] = ...) -> _Number: ...
31+
def pstdev(data: Iterable[_NumberT], mu: Optional[_NumberT] = ...) -> _NumberT: ...
32+
def pvariance(data: Iterable[_NumberT], mu: Optional[_NumberT] = ...) -> _NumberT: ...
3333

3434
if sys.version_info >= (3, 8):
35-
def quantiles(data: Iterable[_Number], *, n: int = ..., method: str = ...) -> List[_Number]: ...
35+
def quantiles(data: Iterable[_NumberT], *, n: int = ..., method: str = ...) -> List[_NumberT]: ...
3636

37-
def stdev(data: Iterable[_Number], xbar: Optional[_Number] = ...) -> _Number: ...
38-
def variance(data: Iterable[_Number], xbar: Optional[_Number] = ...) -> _Number: ...
37+
def stdev(data: Iterable[_NumberT], xbar: Optional[_NumberT] = ...) -> _NumberT: ...
38+
def variance(data: Iterable[_NumberT], xbar: Optional[_NumberT] = ...) -> _NumberT: ...
3939

4040
if sys.version_info >= (3, 8):
4141
class NormalDist:

‎third_party/2and3/google/protobuf/json_format.pyi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ from typing import Any, Dict, Text, TypeVar, Union
22

33
from google.protobuf.message import Message
44

5-
_MessageVar = TypeVar("_MessageVar", bound=Message)
5+
_MessageT = TypeVar("_MessageT", bound=Message)
66

77
class Error(Exception): ...
88
class ParseError(Error): ...
@@ -22,5 +22,5 @@ def MessageToDict(
2222
preserving_proto_field_name: bool = ...,
2323
use_integers_for_enums: bool = ...,
2424
) -> Dict[Text, Any]: ...
25-
def Parse(text: Union[bytes, Text], message: _MessageVar, ignore_unknown_fields: bool = ...) -> _MessageVar: ...
26-
def ParseDict(js_dict: Any, message: _MessageVar, ignore_unknown_fields: bool = ...) -> _MessageVar: ...
25+
def Parse(text: Union[bytes, Text], message: _MessageT, ignore_unknown_fields: bool = ...) -> _MessageT: ...
26+
def ParseDict(js_dict: Any, message: _MessageT, ignore_unknown_fields: bool = ...) -> _MessageT: ...

0 commit comments

Comments
 (0)