stdlib: enforce CamelCase for type alias names (#8255)

Author: AlexWaygood

stdlib/_ast.pyi

@@ -7,7 +7,7 @@ if sys.version_info >= (3, 8):
     PyCF_TYPE_COMMENTS: Literal[4096]
     PyCF_ALLOW_TOP_LEVEL_AWAIT: Literal[8192]
 
-_identifier: TypeAlias = str
+_Identifier: TypeAlias = str
 
 class AST:
     if sys.version_info >= (3, 10):
@@ -61,7 +61,7 @@ class stmt(AST): ...
 class FunctionDef(stmt):
     if sys.version_info >= (3, 10):
         __match_args__ = ("name", "args", "body", "decorator_list", "returns", "type_comment")
-    name: _identifier
+    name: _Identifier
     args: arguments
     body: list[stmt]
     decorator_list: list[expr]
@@ -70,7 +70,7 @@ class FunctionDef(stmt):
 class AsyncFunctionDef(stmt):
     if sys.version_info >= (3, 10):
         __match_args__ = ("name", "args", "body", "decorator_list", "returns", "type_comment")
-    name: _identifier
+    name: _Identifier
     args: arguments
     body: list[stmt]
     decorator_list: list[expr]
@@ -79,7 +79,7 @@ class AsyncFunctionDef(stmt):
 class ClassDef(stmt):
     if sys.version_info >= (3, 10):
         __match_args__ = ("name", "bases", "keywords", "body", "decorator_list")
-    name: _identifier
+    name: _Identifier
     bases: list[expr]
     keywords: list[keyword]
     body: list[stmt]
@@ -194,19 +194,19 @@ class Import(stmt):
 class ImportFrom(stmt):
     if sys.version_info >= (3, 10):
         __match_args__ = ("module", "names", "level")
-    module: _identifier | None
+    module: _Identifier | None
     names: list[alias]
     level: int
 
 class Global(stmt):
     if sys.version_info >= (3, 10):
         __match_args__ = ("names",)
-    names: list[_identifier]
+    names: list[_Identifier]
 
 class Nonlocal(stmt):
     if sys.version_info >= (3, 10):
         __match_args__ = ("names",)
-    names: list[_identifier]
+    names: list[_Identifier]
 
 class Expr(stmt):
     if sys.version_info >= (3, 10):
@@ -362,7 +362,7 @@ class Attribute(expr):
     if sys.version_info >= (3, 10):
         __match_args__ = ("value", "attr", "ctx")
     value: expr
-    attr: _identifier
+    attr: _Identifier
     ctx: expr_context
 
 if sys.version_info >= (3, 9):
@@ -401,7 +401,7 @@ class Starred(expr):
 class Name(expr):
     if sys.version_info >= (3, 10):
         __match_args__ = ("id", "ctx")
-    id: _identifier
+    id: _Identifier
     ctx: expr_context
 
 class List(expr):
@@ -479,7 +479,7 @@ class ExceptHandler(excepthandler):
     if sys.version_info >= (3, 10):
         __match_args__ = ("type", "name", "body")
     type: expr | None
-    name: _identifier | None
+    name: _Identifier | None
     body: list[stmt]
 
 class arguments(AST):
@@ -497,20 +497,20 @@ class arguments(AST):
 class arg(AST):
     if sys.version_info >= (3, 10):
         __match_args__ = ("arg", "annotation", "type_comment")
-    arg: _identifier
+    arg: _Identifier
     annotation: expr | None
 
 class keyword(AST):
     if sys.version_info >= (3, 10):
         __match_args__ = ("arg", "value")
-    arg: _identifier | None
+    arg: _Identifier | None
     value: expr
 
 class alias(AST):
     if sys.version_info >= (3, 10):
         __match_args__ = ("name", "asname")
-    name: _identifier
-    asname: _identifier | None
+    name: _Identifier
+    asname: _Identifier | None
 
 class withitem(AST):
     if sys.version_info >= (3, 10):
@@ -526,11 +526,11 @@ if sys.version_info >= (3, 10):
 
     class pattern(AST): ...
     # Without the alias, Pyright complains variables named pattern are recursively defined
-    _pattern: TypeAlias = pattern
+    _Pattern: TypeAlias = pattern
 
     class match_case(AST):
         __match_args__ = ("pattern", "guard", "body")
-        pattern: _pattern
+        pattern: _Pattern
         guard: expr | None
         body: list[stmt]
 
@@ -548,25 +548,25 @@ if sys.version_info >= (3, 10):
 
     class MatchStar(pattern):
         __match_args__ = ("name",)
-        name: _identifier | None
+        name: _Identifier | None
 
     class MatchMapping(pattern):
         __match_args__ = ("keys", "patterns", "rest")
         keys: list[expr]
         patterns: list[pattern]
-        rest: _identifier | None
+        rest: _Identifier | None
 
     class MatchClass(pattern):
         __match_args__ = ("cls", "patterns", "kwd_attrs", "kwd_patterns")
         cls: expr
         patterns: list[pattern]
-        kwd_attrs: list[_identifier]
+        kwd_attrs: list[_Identifier]
         kwd_patterns: list[pattern]
 
     class MatchAs(pattern):
         __match_args__ = ("pattern", "name")
-        pattern: _pattern | None
-        name: _identifier | None
+        pattern: _Pattern | None
+        name: _Identifier | None
 
     class MatchOr(pattern):
         __match_args__ = ("patterns",)

stdlib/_curses.pyi

@@ -4,7 +4,7 @@ from typing import IO, Any, NamedTuple, overload
 from typing_extensions import TypeAlias, final
 
 if sys.platform != "win32":
-    _chtype: TypeAlias = str | bytes | int
+    _ChType: TypeAlias = str | bytes | int
 
     # ACS codes are only initialized after initscr is called
     ACS_BBSS: int
@@ -365,9 +365,9 @@ if sys.platform != "win32":
         __i9: int = ...,
     ) -> bytes: ...
     def typeahead(__fd: int) -> None: ...
-    def unctrl(__ch: _chtype) -> bytes: ...
+    def unctrl(__ch: _ChType) -> bytes: ...
     def unget_wch(__ch: int | str) -> None: ...
-    def ungetch(__ch: _chtype) -> None: ...
+    def ungetch(__ch: _ChType) -> None: ...
     def ungetmouse(__id: int, __x: int, __y: int, __z: int, __bstate: int) -> None: ...
     def update_lines_cols() -> None: ...
     def use_default_colors() -> None: ...
@@ -379,9 +379,9 @@ if sys.platform != "win32":
     class _CursesWindow:
         encoding: str
         @overload
-        def addch(self, ch: _chtype, attr: int = ...) -> None: ...
+        def addch(self, ch: _ChType, attr: int = ...) -> None: ...
         @overload
-        def addch(self, y: int, x: int, ch: _chtype, attr: int = ...) -> None: ...
+        def addch(self, y: int, x: int, ch: _ChType, attr: int = ...) -> None: ...
         @overload
         def addnstr(self, str: str, n: int, attr: int = ...) -> None: ...
         @overload
@@ -393,23 +393,23 @@ if sys.platform != "win32":
         def attroff(self, __attr: int) -> None: ...
         def attron(self, __attr: int) -> None: ...
         def attrset(self, __attr: int) -> None: ...
-        def bkgd(self, __ch: _chtype, __attr: int = ...) -> None: ...
-        def bkgdset(self, __ch: _chtype, __attr: int = ...) -> None: ...
+        def bkgd(self, __ch: _ChType, __attr: int = ...) -> None: ...
+        def bkgdset(self, __ch: _ChType, __attr: int = ...) -> None: ...
         def border(
             self,
-            ls: _chtype = ...,
-            rs: _chtype = ...,
-            ts: _chtype = ...,
-            bs: _chtype = ...,
-            tl: _chtype = ...,
-            tr: _chtype = ...,
-            bl: _chtype = ...,
-            br: _chtype = ...,
+            ls: _ChType = ...,
+            rs: _ChType = ...,
+            ts: _ChType = ...,
+            bs: _ChType = ...,
+            tl: _ChType = ...,
+            tr: _ChType = ...,
+            bl: _ChType = ...,
+            br: _ChType = ...,
         ) -> None: ...
         @overload
         def box(self) -> None: ...
         @overload
-        def box(self, vertch: _chtype = ..., horch: _chtype = ...) -> None: ...
+        def box(self, vertch: _ChType = ..., horch: _ChType = ...) -> None: ...
         @overload
         def chgat(self, attr: int) -> None: ...
         @overload
@@ -432,7 +432,7 @@ if sys.platform != "win32":
         def derwin(self, begin_y: int, begin_x: int) -> _CursesWindow: ...
         @overload
         def derwin(self, nlines: int, ncols: int, begin_y: int, begin_x: int) -> _CursesWindow: ...
-        def echochar(self, __ch: _chtype, __attr: int = ...) -> None: ...
+        def echochar(self, __ch: _ChType, __attr: int = ...) -> None: ...
         def enclose(self, __y: int, __x: int) -> bool: ...
         def erase(self) -> None: ...
         def getbegyx(self) -> tuple[int, int]: ...
@@ -461,9 +461,9 @@ if sys.platform != "win32":
         def getstr(self, y: int, x: int, n: int) -> bytes: ...
         def getyx(self) -> tuple[int, int]: ...
         @overload
-        def hline(self, ch: _chtype, n: int) -> None: ...
+        def hline(self, ch: _ChType, n: int) -> None: ...
         @overload
-        def hline(self, y: int, x: int, ch: _chtype, n: int) -> None: ...
+        def hline(self, y: int, x: int, ch: _ChType, n: int) -> None: ...
         def idcok(self, flag: bool) -> None: ...
         def idlok(self, yes: bool) -> None: ...
         def immedok(self, flag: bool) -> None: ...
@@ -472,9 +472,9 @@ if sys.platform != "win32":
         @overload
         def inch(self, y: int, x: int) -> int: ...
         @overload
-        def insch(self, ch: _chtype, attr: int = ...) -> None: ...
+        def insch(self, ch: _ChType, attr: int = ...) -> None: ...
         @overload
-        def insch(self, y: int, x: int, ch: _chtype, attr: int = ...) -> None: ...
+        def insch(self, y: int, x: int, ch: _ChType, attr: int = ...) -> None: ...
         def insdelln(self, nlines: int) -> None: ...
         def insertln(self) -> None: ...
         @overload
@@ -543,9 +543,9 @@ if sys.platform != "win32":
         def touchwin(self) -> None: ...
         def untouchwin(self) -> None: ...
         @overload
-        def vline(self, ch: _chtype, n: int) -> None: ...
+        def vline(self, ch: _ChType, n: int) -> None: ...
         @overload
-        def vline(self, y: int, x: int, ch: _chtype, n: int) -> None: ...
+        def vline(self, y: int, x: int, ch: _ChType, n: int) -> None: ...
     if sys.version_info >= (3, 8):
         class _ncurses_version(NamedTuple):
             major: int

stdlib/_threading_local.pyi

@@ -3,14 +3,14 @@ from typing_extensions import TypeAlias
 from weakref import ReferenceType
 
 __all__ = ["local"]
-_localdict: TypeAlias = dict[Any, Any]
+_LocalDict: TypeAlias = dict[Any, Any]
 
 class _localimpl:
     key: str
-    dicts: dict[int, tuple[ReferenceType[Any], _localdict]]
+    dicts: dict[int, tuple[ReferenceType[Any], _LocalDict]]
     def __init__(self) -> None: ...
-    def get_dict(self) -> _localdict: ...
-    def create_dict(self) -> _localdict: ...
+    def get_dict(self) -> _LocalDict: ...
+    def create_dict(self) -> _LocalDict: ...
 
 class local:
     def __getattribute__(self, name: str) -> Any: ...

stdlib/asynchat.pyi

@@ -9,7 +9,7 @@ class simple_producer:
 class async_chat(asyncore.dispatcher):
     ac_in_buffer_size: int
     ac_out_buffer_size: int
-    def __init__(self, sock: socket.socket | None = ..., map: asyncore._maptype | None = ...) -> None: ...
+    def __init__(self, sock: socket.socket | None = ..., map: asyncore._MapType | None = ...) -> None: ...
     @abstractmethod
     def collect_incoming_data(self, data: bytes) -> None: ...
     @abstractmethod

stdlib/asyncore.pyi

@@ -5,22 +5,22 @@ from typing import Any, overload
 from typing_extensions import TypeAlias
 
 # cyclic dependence with asynchat
-_maptype: TypeAlias = dict[int, Any]
-_socket: TypeAlias = socket
+_MapType: TypeAlias = dict[int, Any]
+_Socket: TypeAlias = socket
 
-socket_map: _maptype  # undocumented
+socket_map: _MapType  # undocumented
 
 class ExitNow(Exception): ...
 
 def read(obj: Any) -> None: ...
 def write(obj: Any) -> None: ...
 def readwrite(obj: Any, flags: int) -> None: ...
-def poll(timeout: float = ..., map: _maptype | None = ...) -> None: ...
-def poll2(timeout: float = ..., map: _maptype | None = ...) -> None: ...
+def poll(timeout: float = ..., map: _MapType | None = ...) -> None: ...
+def poll2(timeout: float = ..., map: _MapType | None = ...) -> None: ...
 
 poll3 = poll2
 
-def loop(timeout: float = ..., use_poll: bool = ..., map: _maptype | None = ..., count: int | None = ...) -> None: ...
+def loop(timeout: float = ..., use_poll: bool = ..., map: _MapType | None = ..., count: int | None = ...) -> None: ...
 
 # Not really subclass of socket.socket; it's only delegation.
 # It is not covariant to it.
@@ -32,19 +32,19 @@ class dispatcher:
     connecting: bool
     closing: bool
     ignore_log_types: frozenset[str]
-    socket: _socket | None
-    def __init__(self, sock: _socket | None = ..., map: _maptype | None = ...) -> None: ...
-    def add_channel(self, map: _maptype | None = ...) -> None: ...
-    def del_channel(self, map: _maptype | None = ...) -> None: ...
+    socket: _Socket | None
+    def __init__(self, sock: _Socket | None = ..., map: _MapType | None = ...) -> None: ...
+    def add_channel(self, map: _MapType | None = ...) -> None: ...
+    def del_channel(self, map: _MapType | None = ...) -> None: ...
     def create_socket(self, family: int = ..., type: int = ...) -> None: ...
-    def set_socket(self, sock: _socket, map: _maptype | None = ...) -> None: ...
+    def set_socket(self, sock: _Socket, map: _MapType | None = ...) -> None: ...
     def set_reuse_addr(self) -> None: ...
     def readable(self) -> bool: ...
     def writable(self) -> bool: ...
     def listen(self, num: int) -> None: ...
     def bind(self, addr: tuple[Any, ...] | str) -> None: ...
     def connect(self, address: tuple[Any, ...] | str) -> None: ...
-    def accept(self) -> tuple[_socket, Any] | None: ...
+    def accept(self) -> tuple[_Socket, Any] | None: ...
     def send(self, data: bytes) -> int: ...
     def recv(self, buffer_size: int) -> bytes: ...
     def close(self) -> None: ...
@@ -63,14 +63,14 @@ class dispatcher:
     def handle_close(self) -> None: ...
 
 class dispatcher_with_send(dispatcher):
-    def __init__(self, sock: socket | None = ..., map: _maptype | None = ...) -> None: ...
+    def __init__(self, sock: socket | None = ..., map: _MapType | None = ...) -> None: ...
     def initiate_send(self) -> None: ...
     def handle_write(self) -> None: ...
     # incompatible signature:
     # def send(self, data: bytes) -> int | None: ...
 
 def compact_traceback() -> tuple[tuple[str, str, str], type, type, str]: ...
-def close_all(map: _maptype | None = ..., ignore_all: bool = ...) -> None: ...
+def close_all(map: _MapType | None = ..., ignore_all: bool = ...) -> None: ...
 
 if sys.platform != "win32":
     class file_wrapper:
@@ -88,5 +88,5 @@ if sys.platform != "win32":
         def fileno(self) -> int: ...
 
     class file_dispatcher(dispatcher):
-        def __init__(self, fd: FileDescriptorLike, map: _maptype | None = ...) -> None: ...
+        def __init__(self, fd: FileDescriptorLike, map: _MapType | None = ...) -> None: ...
         def set_file(self, fd: int) -> None: ...