Big diff: use lower-case list and dict (#5888)

2025-12-08 04:54:47 +08:00 · 2021-08-08 19:26:35 +03:00
parent 11f54c3407
commit ce11072dbe
325 changed files with 2196 additions and 2334 deletions
--- a/stdlib/xml/etree/ElementPath.pyi
+++ b/stdlib/xml/etree/ElementPath.pyi
@@ -1,4 +1,4 @@
-from typing import Callable, Dict, Generator, List, Pattern, Tuple, TypeVar
+from typing import Callable, Generator, List, Pattern, Tuple, TypeVar
 from xml.etree.ElementTree import Element

 xpath_tokenizer_re: Pattern[str]
@@ -7,8 +7,8 @@ _token = Tuple[str, str]
 _next = Callable[[], _token]
 _callback = Callable[[_SelectorContext, List[Element]], Generator[Element, None, None]]

-def xpath_tokenizer(pattern: str, namespaces: Dict[str, str] | None = ...) -> Generator[_token, None, None]: ...
-def get_parent_map(context: _SelectorContext) -> Dict[Element, Element]: ...
+def xpath_tokenizer(pattern: str, namespaces: dict[str, str] | None = ...) -> Generator[_token, None, None]: ...
+def get_parent_map(context: _SelectorContext) -> dict[Element, Element]: ...
 def prepare_child(next: _next, token: _token) -> _callback: ...
 def prepare_star(next: _next, token: _token) -> _callback: ...
 def prepare_self(next: _next, token: _token) -> _callback: ...
@@ -16,16 +16,16 @@ def prepare_descendant(next: _next, token: _token) -> _callback: ...
 def prepare_parent(next: _next, token: _token) -> _callback: ...
 def prepare_predicate(next: _next, token: _token) -> _callback: ...

-ops: Dict[str, Callable[[_next, _token], _callback]]
+ops: dict[str, Callable[[_next, _token], _callback]]

 class _SelectorContext:
-    parent_map: Dict[Element, Element] | None
+    parent_map: dict[Element, Element] | None
    root: Element
    def __init__(self, root: Element) -> None: ...

 _T = TypeVar("_T")

-def iterfind(elem: Element, path: str, namespaces: Dict[str, str] | None = ...) -> Generator[Element, None, None]: ...
-def find(elem: Element, path: str, namespaces: Dict[str, str] | None = ...) -> Element | None: ...
-def findall(elem: Element, path: str, namespaces: Dict[str, str] | None = ...) -> List[Element]: ...
-def findtext(elem: Element, path: str, default: _T | None = ..., namespaces: Dict[str, str] | None = ...) -> _T | str: ...
+def iterfind(elem: Element, path: str, namespaces: dict[str, str] | None = ...) -> Generator[Element, None, None]: ...
+def find(elem: Element, path: str, namespaces: dict[str, str] | None = ...) -> Element | None: ...
+def findall(elem: Element, path: str, namespaces: dict[str, str] | None = ...) -> list[Element]: ...
+def findtext(elem: Element, path: str, default: _T | None = ..., namespaces: dict[str, str] | None = ...) -> _T | str: ...
--- a/stdlib/xml/etree/ElementTree.pyi
+++ b/stdlib/xml/etree/ElementTree.pyi
@@ -10,7 +10,6 @@ from typing import (
    Iterable,
    Iterator,
    KeysView,
-    List,
    MutableSequence,
    Sequence,
    Tuple,
@@ -63,19 +62,19 @@ if sys.version_info >= (3, 8):

 class Element(MutableSequence[Element]):
    tag: str
-    attrib: Dict[str, str]
+    attrib: dict[str, str]
    text: str | None
    tail: str | None
-    def __init__(self, tag: str | Callable[..., Element], attrib: Dict[str, str] = ..., **extra: str) -> None: ...
+    def __init__(self, tag: str | Callable[..., Element], attrib: dict[str, str] = ..., **extra: str) -> None: ...
    def append(self, __subelement: Element) -> None: ...
    def clear(self) -> None: ...
    def extend(self, __elements: Iterable[Element]) -> None: ...
-    def find(self, path: str, namespaces: Dict[str, str] | None = ...) -> Element | None: ...
-    def findall(self, path: str, namespaces: Dict[str, str] | None = ...) -> List[Element]: ...
+    def find(self, path: str, namespaces: dict[str, str] | None = ...) -> Element | None: ...
+    def findall(self, path: str, namespaces: dict[str, str] | None = ...) -> list[Element]: ...
    @overload
-    def findtext(self, path: str, default: None = ..., namespaces: Dict[str, str] | None = ...) -> str | None: ...
+    def findtext(self, path: str, default: None = ..., namespaces: dict[str, str] | None = ...) -> str | None: ...
    @overload
-    def findtext(self, path: str, default: _T, namespaces: Dict[str, str] | None = ...) -> _T | str: ...
+    def findtext(self, path: str, default: _T, namespaces: dict[str, str] | None = ...) -> _T | str: ...
    @overload
    def get(self, key: str, default: None = ...) -> str | None: ...
    @overload
@@ -83,10 +82,10 @@ class Element(MutableSequence[Element]):
    def insert(self, __index: int, __subelement: Element) -> None: ...
    def items(self) -> ItemsView[str, str]: ...
    def iter(self, tag: str | None = ...) -> Generator[Element, None, None]: ...
-    def iterfind(self, path: str, namespaces: Dict[str, str] | None = ...) -> Generator[Element, None, None]: ...
+    def iterfind(self, path: str, namespaces: dict[str, str] | None = ...) -> Generator[Element, None, None]: ...
    def itertext(self) -> Generator[str, None, None]: ...
    def keys(self) -> KeysView[str]: ...
-    def makeelement(self, __tag: str, __attrib: Dict[str, str]) -> Element: ...
+    def makeelement(self, __tag: str, __attrib: dict[str, str]) -> Element: ...
    def remove(self, __subelement: Element) -> None: ...
    def set(self, __key: str, __value: str) -> None: ...
    def __delitem__(self, i: int | slice) -> None: ...
@@ -100,10 +99,10 @@ class Element(MutableSequence[Element]):
    @overload
    def __setitem__(self, s: slice, o: Iterable[Element]) -> None: ...
    if sys.version_info < (3, 9):
-        def getchildren(self) -> List[Element]: ...
-        def getiterator(self, tag: str | None = ...) -> List[Element]: ...
+        def getchildren(self) -> list[Element]: ...
+        def getiterator(self, tag: str | None = ...) -> list[Element]: ...

-def SubElement(parent: Element, tag: str, attrib: Dict[str, str] = ..., **extra: str) -> Element: ...
+def SubElement(parent: Element, tag: str, attrib: dict[str, str] = ..., **extra: str) -> Element: ...
 def Comment(text: str | None = ...) -> Element: ...
 def ProcessingInstruction(target: str, text: str | None = ...) -> Element: ...

@@ -119,14 +118,14 @@ class ElementTree:
    def parse(self, source: _File, parser: XMLParser | None = ...) -> Element: ...
    def iter(self, tag: str | None = ...) -> Generator[Element, None, None]: ...
    if sys.version_info < (3, 9):
-        def getiterator(self, tag: str | None = ...) -> List[Element]: ...
-    def find(self, path: str, namespaces: Dict[str, str] | None = ...) -> Element | None: ...
+        def getiterator(self, tag: str | None = ...) -> list[Element]: ...
+    def find(self, path: str, namespaces: dict[str, str] | None = ...) -> Element | None: ...
    @overload
-    def findtext(self, path: str, default: None = ..., namespaces: Dict[str, str] | None = ...) -> str | None: ...
+    def findtext(self, path: str, default: None = ..., namespaces: dict[str, str] | None = ...) -> str | None: ...
    @overload
-    def findtext(self, path: str, default: _T, namespaces: Dict[str, str] | None = ...) -> _T | str: ...
-    def findall(self, path: str, namespaces: Dict[str, str] | None = ...) -> List[Element]: ...
-    def iterfind(self, path: str, namespaces: Dict[str, str] | None = ...) -> Generator[Element, None, None]: ...
+    def findtext(self, path: str, default: _T, namespaces: dict[str, str] | None = ...) -> _T | str: ...
+    def findall(self, path: str, namespaces: dict[str, str] | None = ...) -> list[Element]: ...
+    def iterfind(self, path: str, namespaces: dict[str, str] | None = ...) -> Generator[Element, None, None]: ...
    def write(
        self,
        file_or_filename: _File,
@@ -181,7 +180,7 @@ if sys.version_info >= (3, 8):
        xml_declaration: bool | None = ...,
        default_namespace: str | None = ...,
        short_empty_elements: bool = ...,
-    ) -> List[bytes]: ...
+    ) -> list[bytes]: ...
    @overload
    def tostringlist(
        element: Element,
@@ -191,7 +190,7 @@ if sys.version_info >= (3, 8):
        xml_declaration: bool | None = ...,
        default_namespace: str | None = ...,
        short_empty_elements: bool = ...,
-    ) -> List[str]: ...
+    ) -> list[str]: ...
    @overload
    def tostringlist(
        element: Element,
@@ -201,7 +200,7 @@ if sys.version_info >= (3, 8):
        xml_declaration: bool | None = ...,
        default_namespace: str | None = ...,
        short_empty_elements: bool = ...,
-    ) -> List[Any]: ...
+    ) -> list[Any]: ...

 else:
    @overload
@@ -217,15 +216,15 @@ else:
    @overload
    def tostringlist(
        element: Element, encoding: None = ..., method: str | None = ..., *, short_empty_elements: bool = ...
-    ) -> List[bytes]: ...
+    ) -> list[bytes]: ...
    @overload
    def tostringlist(
        element: Element, encoding: Literal["unicode"], method: str | None = ..., *, short_empty_elements: bool = ...
-    ) -> List[str]: ...
+    ) -> list[str]: ...
    @overload
    def tostringlist(
        element: Element, encoding: str, method: str | None = ..., *, short_empty_elements: bool = ...
-    ) -> List[Any]: ...
+    ) -> list[Any]: ...

 def dump(elem: Element) -> None: ...

@@ -242,7 +241,7 @@ class XMLPullParser:
    def read_events(self) -> Iterator[Tuple[str, Element]]: ...

 def XML(text: str | bytes, parser: XMLParser | None = ...) -> Element: ...
-def XMLID(text: str | bytes, parser: XMLParser | None = ...) -> Tuple[Element, Dict[str, Element]]: ...
+def XMLID(text: str | bytes, parser: XMLParser | None = ...) -> Tuple[Element, dict[str, Element]]: ...

 # This is aliased to XML in the source.
 fromstring = XML
@@ -264,7 +263,7 @@ class TreeBuilder:
    def __init__(self, element_factory: _ElementFactory | None = ...) -> None: ...
    def close(self) -> Element: ...
    def data(self, __data: str | bytes) -> None: ...
-    def start(self, __tag: str | bytes, __attrs: Dict[str | bytes, str | bytes]) -> Element: ...
+    def start(self, __tag: str | bytes, __attrs: dict[str | bytes, str | bytes]) -> Element: ...
    def end(self, __tag: str | bytes) -> Element: ...

 if sys.version_info >= (3, 8):