mirror of
https://github.com/davidhalter/typeshed.git
synced 2025-12-15 16:27:08 +08:00
Big diff: Use new "|" union syntax (#5872)
This commit is contained in:
Akuli
@@ -1,5 +1,5 @@
|
||||
import sys
|
||||
from typing import Callable, Optional, Union
|
||||
from typing import Callable
|
||||
from xml.etree.ElementTree import Element
|
||||
|
||||
XINCLUDE: str
|
||||
@@ -8,18 +8,15 @@ XINCLUDE_FALLBACK: str
|
||||
|
||||
class FatalIncludeError(SyntaxError): ...
|
||||
|
||||
def default_loader(href: Union[str, bytes, int], parse: str, encoding: Optional[str] = ...) -> Union[str, Element]: ...
|
||||
def default_loader(href: str | bytes | int, parse: str, encoding: str | None = ...) -> str | Element: ...
|
||||
|
||||
# TODO: loader is of type default_loader ie it takes a callable that has the
|
||||
# same signature as default_loader. But default_loader has a keyword argument
|
||||
# Which can't be represented using Callable...
|
||||
if sys.version_info >= (3, 9):
|
||||
def include(
|
||||
elem: Element,
|
||||
loader: Optional[Callable[..., Union[str, Element]]] = ...,
|
||||
base_url: Optional[str] = ...,
|
||||
max_depth: Optional[int] = ...,
|
||||
elem: Element, loader: Callable[..., str | Element] | None = ..., base_url: str | None = ..., max_depth: int | None = ...
|
||||
) -> None: ...
|
||||
|
||||
else:
|
||||
def include(elem: Element, loader: Optional[Callable[..., Union[str, Element]]] = ...) -> None: ...
|
||||
def include(elem: Element, loader: Callable[..., str | Element] | None = ...) -> None: ...
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from typing import Callable, Dict, Generator, List, Optional, Pattern, Tuple, TypeVar, Union
|
||||
from typing import Callable, Dict, Generator, List, Pattern, Tuple, TypeVar
|
||||
from xml.etree.ElementTree import Element
|
||||
|
||||
xpath_tokenizer_re: Pattern[str]
|
||||
@@ -7,7 +7,7 @@ _token = Tuple[str, str]
|
||||
_next = Callable[[], _token]
|
||||
_callback = Callable[[_SelectorContext, List[Element]], Generator[Element, None, None]]
|
||||
|
||||
def xpath_tokenizer(pattern: str, namespaces: Optional[Dict[str, str]] = ...) -> Generator[_token, 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 prepare_child(next: _next, token: _token) -> _callback: ...
|
||||
def prepare_star(next: _next, token: _token) -> _callback: ...
|
||||
@@ -19,15 +19,13 @@ def prepare_predicate(next: _next, token: _token) -> _callback: ...
|
||||
ops: Dict[str, Callable[[_next, _token], _callback]]
|
||||
|
||||
class _SelectorContext:
|
||||
parent_map: Optional[Dict[Element, Element]]
|
||||
parent_map: Dict[Element, Element] | None
|
||||
root: Element
|
||||
def __init__(self, root: Element) -> None: ...
|
||||
|
||||
_T = TypeVar("_T")
|
||||
|
||||
def iterfind(elem: Element, path: str, namespaces: Optional[Dict[str, str]] = ...) -> Generator[Element, None, None]: ...
|
||||
def find(elem: Element, path: str, namespaces: Optional[Dict[str, str]] = ...) -> Optional[Element]: ...
|
||||
def findall(elem: Element, path: str, namespaces: Optional[Dict[str, str]] = ...) -> List[Element]: ...
|
||||
def findtext(
|
||||
elem: Element, path: str, default: Optional[_T] = ..., namespaces: Optional[Dict[str, str]] = ...
|
||||
) -> Union[_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: ...
|
||||
|
||||
@@ -12,7 +12,6 @@ from typing import (
|
||||
KeysView,
|
||||
List,
|
||||
MutableSequence,
|
||||
Optional,
|
||||
Sequence,
|
||||
Tuple,
|
||||
TypeVar,
|
||||
@@ -35,62 +34,62 @@ def iselement(element: object) -> bool: ...
|
||||
if sys.version_info >= (3, 8):
|
||||
@overload
|
||||
def canonicalize(
|
||||
xml_data: Optional[Union[str, bytes]] = ...,
|
||||
xml_data: str | bytes | None = ...,
|
||||
*,
|
||||
out: None = ...,
|
||||
from_file: Optional[_File] = ...,
|
||||
from_file: _File | None = ...,
|
||||
with_comments: bool = ...,
|
||||
strip_text: bool = ...,
|
||||
rewrite_prefixes: bool = ...,
|
||||
qname_aware_tags: Optional[Iterable[str]] = ...,
|
||||
qname_aware_attrs: Optional[Iterable[str]] = ...,
|
||||
exclude_attrs: Optional[Iterable[str]] = ...,
|
||||
exclude_tags: Optional[Iterable[str]] = ...,
|
||||
qname_aware_tags: Iterable[str] | None = ...,
|
||||
qname_aware_attrs: Iterable[str] | None = ...,
|
||||
exclude_attrs: Iterable[str] | None = ...,
|
||||
exclude_tags: Iterable[str] | None = ...,
|
||||
) -> str: ...
|
||||
@overload
|
||||
def canonicalize(
|
||||
xml_data: Optional[Union[str, bytes]] = ...,
|
||||
xml_data: str | bytes | None = ...,
|
||||
*,
|
||||
out: SupportsWrite[str],
|
||||
from_file: Optional[_File] = ...,
|
||||
from_file: _File | None = ...,
|
||||
with_comments: bool = ...,
|
||||
strip_text: bool = ...,
|
||||
rewrite_prefixes: bool = ...,
|
||||
qname_aware_tags: Optional[Iterable[str]] = ...,
|
||||
qname_aware_attrs: Optional[Iterable[str]] = ...,
|
||||
exclude_attrs: Optional[Iterable[str]] = ...,
|
||||
exclude_tags: Optional[Iterable[str]] = ...,
|
||||
qname_aware_tags: Iterable[str] | None = ...,
|
||||
qname_aware_attrs: Iterable[str] | None = ...,
|
||||
exclude_attrs: Iterable[str] | None = ...,
|
||||
exclude_tags: Iterable[str] | None = ...,
|
||||
) -> None: ...
|
||||
|
||||
class Element(MutableSequence[Element]):
|
||||
tag: str
|
||||
attrib: Dict[str, str]
|
||||
text: Optional[str]
|
||||
tail: Optional[str]
|
||||
def __init__(self, tag: Union[str, Callable[..., Element]], attrib: Dict[str, str] = ..., **extra: str) -> None: ...
|
||||
text: str | None
|
||||
tail: 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: Optional[Dict[str, str]] = ...) -> Optional[Element]: ...
|
||||
def findall(self, path: str, namespaces: Optional[Dict[str, str]] = ...) -> 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: Optional[Dict[str, str]] = ...) -> Optional[str]: ...
|
||||
def findtext(self, path: str, default: None = ..., namespaces: Dict[str, str] | None = ...) -> str | None: ...
|
||||
@overload
|
||||
def findtext(self, path: str, default: _T, namespaces: Optional[Dict[str, str]] = ...) -> Union[_T, str]: ...
|
||||
def findtext(self, path: str, default: _T, namespaces: Dict[str, str] | None = ...) -> _T | str: ...
|
||||
@overload
|
||||
def get(self, key: str, default: None = ...) -> Optional[str]: ...
|
||||
def get(self, key: str, default: None = ...) -> str | None: ...
|
||||
@overload
|
||||
def get(self, key: str, default: _T) -> Union[str, _T]: ...
|
||||
def get(self, key: str, default: _T) -> str | _T: ...
|
||||
def insert(self, __index: int, __subelement: Element) -> None: ...
|
||||
def items(self) -> ItemsView[str, str]: ...
|
||||
def iter(self, tag: Optional[str] = ...) -> Generator[Element, None, None]: ...
|
||||
def iterfind(self, path: str, namespaces: Optional[Dict[str, str]] = ...) -> Generator[Element, None, None]: ...
|
||||
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 itertext(self) -> Generator[str, None, None]: ...
|
||||
def keys(self) -> KeysView[str]: ...
|
||||
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: Union[int, slice]) -> None: ...
|
||||
def __delitem__(self, i: int | slice) -> None: ...
|
||||
@overload
|
||||
def __getitem__(self, i: int) -> Element: ...
|
||||
@overload
|
||||
@@ -102,39 +101,39 @@ class Element(MutableSequence[Element]):
|
||||
def __setitem__(self, s: slice, o: Iterable[Element]) -> None: ...
|
||||
if sys.version_info < (3, 9):
|
||||
def getchildren(self) -> List[Element]: ...
|
||||
def getiterator(self, tag: Optional[str] = ...) -> List[Element]: ...
|
||||
def getiterator(self, tag: str | None = ...) -> List[Element]: ...
|
||||
|
||||
def SubElement(parent: Element, tag: str, attrib: Dict[str, str] = ..., **extra: str) -> Element: ...
|
||||
def Comment(text: Optional[str] = ...) -> Element: ...
|
||||
def ProcessingInstruction(target: str, text: Optional[str] = ...) -> Element: ...
|
||||
def Comment(text: str | None = ...) -> Element: ...
|
||||
def ProcessingInstruction(target: str, text: str | None = ...) -> Element: ...
|
||||
|
||||
PI: Callable[..., Element]
|
||||
|
||||
class QName:
|
||||
text: str
|
||||
def __init__(self, text_or_uri: str, tag: Optional[str] = ...) -> None: ...
|
||||
def __init__(self, text_or_uri: str, tag: str | None = ...) -> None: ...
|
||||
|
||||
class ElementTree:
|
||||
def __init__(self, element: Optional[Element] = ..., file: Optional[_File] = ...) -> None: ...
|
||||
def __init__(self, element: Element | None = ..., file: _File | None = ...) -> None: ...
|
||||
def getroot(self) -> Element: ...
|
||||
def parse(self, source: _File, parser: Optional[XMLParser] = ...) -> Element: ...
|
||||
def iter(self, tag: Optional[str] = ...) -> Generator[Element, None, None]: ...
|
||||
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: Optional[str] = ...) -> List[Element]: ...
|
||||
def find(self, path: str, namespaces: Optional[Dict[str, str]] = ...) -> Optional[Element]: ...
|
||||
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: Optional[Dict[str, str]] = ...) -> Optional[str]: ...
|
||||
def findtext(self, path: str, default: None = ..., namespaces: Dict[str, str] | None = ...) -> str | None: ...
|
||||
@overload
|
||||
def findtext(self, path: str, default: _T, namespaces: Optional[Dict[str, str]] = ...) -> Union[_T, str]: ...
|
||||
def findall(self, path: str, namespaces: Optional[Dict[str, str]] = ...) -> List[Element]: ...
|
||||
def iterfind(self, path: str, namespaces: Optional[Dict[str, str]] = ...) -> 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,
|
||||
encoding: Optional[str] = ...,
|
||||
xml_declaration: Optional[bool] = ...,
|
||||
default_namespace: Optional[str] = ...,
|
||||
method: Optional[str] = ...,
|
||||
encoding: str | None = ...,
|
||||
xml_declaration: bool | None = ...,
|
||||
default_namespace: str | None = ...,
|
||||
method: str | None = ...,
|
||||
*,
|
||||
short_empty_elements: bool = ...,
|
||||
) -> None: ...
|
||||
@@ -147,110 +146,108 @@ if sys.version_info >= (3, 8):
|
||||
def tostring(
|
||||
element: Element,
|
||||
encoding: None = ...,
|
||||
method: Optional[str] = ...,
|
||||
method: str | None = ...,
|
||||
*,
|
||||
xml_declaration: Optional[bool] = ...,
|
||||
default_namespace: Optional[str] = ...,
|
||||
xml_declaration: bool | None = ...,
|
||||
default_namespace: str | None = ...,
|
||||
short_empty_elements: bool = ...,
|
||||
) -> bytes: ...
|
||||
@overload
|
||||
def tostring(
|
||||
element: Element,
|
||||
encoding: Literal["unicode"],
|
||||
method: Optional[str] = ...,
|
||||
method: str | None = ...,
|
||||
*,
|
||||
xml_declaration: Optional[bool] = ...,
|
||||
default_namespace: Optional[str] = ...,
|
||||
xml_declaration: bool | None = ...,
|
||||
default_namespace: str | None = ...,
|
||||
short_empty_elements: bool = ...,
|
||||
) -> str: ...
|
||||
@overload
|
||||
def tostring(
|
||||
element: Element,
|
||||
encoding: str,
|
||||
method: Optional[str] = ...,
|
||||
method: str | None = ...,
|
||||
*,
|
||||
xml_declaration: Optional[bool] = ...,
|
||||
default_namespace: Optional[str] = ...,
|
||||
xml_declaration: bool | None = ...,
|
||||
default_namespace: str | None = ...,
|
||||
short_empty_elements: bool = ...,
|
||||
) -> Any: ...
|
||||
@overload
|
||||
def tostringlist(
|
||||
element: Element,
|
||||
encoding: None = ...,
|
||||
method: Optional[str] = ...,
|
||||
method: str | None = ...,
|
||||
*,
|
||||
xml_declaration: Optional[bool] = ...,
|
||||
default_namespace: Optional[str] = ...,
|
||||
xml_declaration: bool | None = ...,
|
||||
default_namespace: str | None = ...,
|
||||
short_empty_elements: bool = ...,
|
||||
) -> List[bytes]: ...
|
||||
@overload
|
||||
def tostringlist(
|
||||
element: Element,
|
||||
encoding: Literal["unicode"],
|
||||
method: Optional[str] = ...,
|
||||
method: str | None = ...,
|
||||
*,
|
||||
xml_declaration: Optional[bool] = ...,
|
||||
default_namespace: Optional[str] = ...,
|
||||
xml_declaration: bool | None = ...,
|
||||
default_namespace: str | None = ...,
|
||||
short_empty_elements: bool = ...,
|
||||
) -> List[str]: ...
|
||||
@overload
|
||||
def tostringlist(
|
||||
element: Element,
|
||||
encoding: str,
|
||||
method: Optional[str] = ...,
|
||||
method: str | None = ...,
|
||||
*,
|
||||
xml_declaration: Optional[bool] = ...,
|
||||
default_namespace: Optional[str] = ...,
|
||||
xml_declaration: bool | None = ...,
|
||||
default_namespace: str | None = ...,
|
||||
short_empty_elements: bool = ...,
|
||||
) -> List[Any]: ...
|
||||
|
||||
else:
|
||||
@overload
|
||||
def tostring(
|
||||
element: Element, encoding: None = ..., method: Optional[str] = ..., *, short_empty_elements: bool = ...
|
||||
element: Element, encoding: None = ..., method: str | None = ..., *, short_empty_elements: bool = ...
|
||||
) -> bytes: ...
|
||||
@overload
|
||||
def tostring(
|
||||
element: Element, encoding: Literal["unicode"], method: Optional[str] = ..., *, short_empty_elements: bool = ...
|
||||
element: Element, encoding: Literal["unicode"], method: str | None = ..., *, short_empty_elements: bool = ...
|
||||
) -> str: ...
|
||||
@overload
|
||||
def tostring(element: Element, encoding: str, method: Optional[str] = ..., *, short_empty_elements: bool = ...) -> Any: ...
|
||||
def tostring(element: Element, encoding: str, method: str | None = ..., *, short_empty_elements: bool = ...) -> Any: ...
|
||||
@overload
|
||||
def tostringlist(
|
||||
element: Element, encoding: None = ..., method: Optional[str] = ..., *, short_empty_elements: bool = ...
|
||||
element: Element, encoding: None = ..., method: str | None = ..., *, short_empty_elements: bool = ...
|
||||
) -> List[bytes]: ...
|
||||
@overload
|
||||
def tostringlist(
|
||||
element: Element, encoding: Literal["unicode"], method: Optional[str] = ..., *, short_empty_elements: bool = ...
|
||||
element: Element, encoding: Literal["unicode"], method: str | None = ..., *, short_empty_elements: bool = ...
|
||||
) -> List[str]: ...
|
||||
@overload
|
||||
def tostringlist(
|
||||
element: Element, encoding: str, method: Optional[str] = ..., *, short_empty_elements: bool = ...
|
||||
element: Element, encoding: str, method: str | None = ..., *, short_empty_elements: bool = ...
|
||||
) -> List[Any]: ...
|
||||
|
||||
def dump(elem: Element) -> None: ...
|
||||
|
||||
if sys.version_info >= (3, 9):
|
||||
def indent(tree: Union[Element, ElementTree], space: str = ..., level: int = ...) -> None: ...
|
||||
def indent(tree: Element | ElementTree, space: str = ..., level: int = ...) -> None: ...
|
||||
|
||||
def parse(source: _File, parser: Optional[XMLParser] = ...) -> ElementTree: ...
|
||||
def iterparse(
|
||||
source: _File, events: Optional[Sequence[str]] = ..., parser: Optional[XMLParser] = ...
|
||||
) -> Iterator[Tuple[str, Any]]: ...
|
||||
def parse(source: _File, parser: XMLParser | None = ...) -> ElementTree: ...
|
||||
def iterparse(source: _File, events: Sequence[str] | None = ..., parser: XMLParser | None = ...) -> Iterator[Tuple[str, Any]]: ...
|
||||
|
||||
class XMLPullParser:
|
||||
def __init__(self, events: Optional[Sequence[str]] = ..., *, _parser: Optional[XMLParser] = ...) -> None: ...
|
||||
def __init__(self, events: Sequence[str] | None = ..., *, _parser: XMLParser | None = ...) -> None: ...
|
||||
def feed(self, data: bytes) -> None: ...
|
||||
def close(self) -> None: ...
|
||||
def read_events(self) -> Iterator[Tuple[str, Element]]: ...
|
||||
|
||||
def XML(text: Union[str, bytes], parser: Optional[XMLParser] = ...) -> Element: ...
|
||||
def XMLID(text: Union[str, bytes], parser: Optional[XMLParser] = ...) -> Tuple[Element, Dict[str, Element]]: ...
|
||||
def XML(text: str | bytes, parser: XMLParser | None = ...) -> Element: ...
|
||||
def XMLID(text: str | bytes, parser: XMLParser | None = ...) -> Tuple[Element, Dict[str, Element]]: ...
|
||||
|
||||
# This is aliased to XML in the source.
|
||||
fromstring = XML
|
||||
|
||||
def fromstringlist(sequence: Sequence[Union[str, bytes]], parser: Optional[XMLParser] = ...) -> Element: ...
|
||||
def fromstringlist(sequence: Sequence[str | bytes], parser: XMLParser | None = ...) -> Element: ...
|
||||
|
||||
# This type is both not precise enough and too precise. The TreeBuilder
|
||||
# requires the elementfactory to accept tag and attrs in its args and produce
|
||||
@@ -264,11 +261,11 @@ def fromstringlist(sequence: Sequence[Union[str, bytes]], parser: Optional[XMLPa
|
||||
_ElementFactory = Callable[[Any, Dict[Any, Any]], Element]
|
||||
|
||||
class TreeBuilder:
|
||||
def __init__(self, element_factory: Optional[_ElementFactory] = ...) -> None: ...
|
||||
def __init__(self, element_factory: _ElementFactory | None = ...) -> None: ...
|
||||
def close(self) -> Element: ...
|
||||
def data(self, __data: Union[str, bytes]) -> None: ...
|
||||
def start(self, __tag: Union[str, bytes], __attrs: Dict[Union[str, bytes], Union[str, bytes]]) -> Element: ...
|
||||
def end(self, __tag: Union[str, bytes]) -> Element: ...
|
||||
def data(self, __data: str | bytes) -> None: ...
|
||||
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):
|
||||
class C14NWriterTarget:
|
||||
@@ -279,10 +276,10 @@ if sys.version_info >= (3, 8):
|
||||
with_comments: bool = ...,
|
||||
strip_text: bool = ...,
|
||||
rewrite_prefixes: bool = ...,
|
||||
qname_aware_tags: Optional[Iterable[str]] = ...,
|
||||
qname_aware_attrs: Optional[Iterable[str]] = ...,
|
||||
exclude_attrs: Optional[Iterable[str]] = ...,
|
||||
exclude_tags: Optional[Iterable[str]] = ...,
|
||||
qname_aware_tags: Iterable[str] | None = ...,
|
||||
qname_aware_attrs: Iterable[str] | None = ...,
|
||||
exclude_attrs: Iterable[str] | None = ...,
|
||||
exclude_tags: Iterable[str] | None = ...,
|
||||
) -> None: ...
|
||||
|
||||
class XMLParser:
|
||||
@@ -292,9 +289,9 @@ class XMLParser:
|
||||
entity: Any
|
||||
version: str
|
||||
if sys.version_info >= (3, 8):
|
||||
def __init__(self, *, target: Any = ..., encoding: Optional[str] = ...) -> None: ...
|
||||
def __init__(self, *, target: Any = ..., encoding: str | None = ...) -> None: ...
|
||||
else:
|
||||
def __init__(self, html: int = ..., target: Any = ..., encoding: Optional[str] = ...) -> None: ...
|
||||
def __init__(self, html: int = ..., target: Any = ..., encoding: str | None = ...) -> None: ...
|
||||
def doctype(self, __name: str, __pubid: str, __system: str) -> None: ...
|
||||
def close(self) -> Any: ...
|
||||
def feed(self, __data: Union[str, bytes]) -> None: ...
|
||||
def feed(self, __data: str | bytes) -> None: ...
|
||||
|
||||
Reference in New Issue
Block a user