mirror of
https://github.com/davidhalter/typeshed.git
synced 2026-03-14 02:36:44 +08:00
Remove compatibility aliases (#5464)
* Remove compatibility aliases Remove a few instances of Text Use aliases from _typeshed * Remove unused imports
This commit is contained in:
@@ -10,7 +10,6 @@ from typing import (
|
||||
NamedTuple,
|
||||
Optional,
|
||||
Sequence,
|
||||
Text,
|
||||
Tuple,
|
||||
TypeVar,
|
||||
Union,
|
||||
@@ -21,8 +20,7 @@ if sys.version_info >= (3, 9):
|
||||
from types import GenericAlias
|
||||
|
||||
_T = TypeVar("_T")
|
||||
_StrType = Text
|
||||
_JunkCallback = Union[Callable[[Text], bool], Callable[[str], bool]]
|
||||
_JunkCallback = Union[Callable[[str], bool], Callable[[str], bool]]
|
||||
|
||||
class Match(NamedTuple):
|
||||
a: int
|
||||
@@ -63,33 +61,33 @@ def get_close_matches(
|
||||
|
||||
class Differ:
|
||||
def __init__(self, linejunk: Optional[_JunkCallback] = ..., charjunk: Optional[_JunkCallback] = ...) -> None: ...
|
||||
def compare(self, a: Sequence[_StrType], b: Sequence[_StrType]) -> Iterator[_StrType]: ...
|
||||
def compare(self, a: Sequence[str], b: Sequence[str]) -> Iterator[str]: ...
|
||||
|
||||
def IS_LINE_JUNK(line: _StrType, pat: Any = ...) -> bool: ... # pat is undocumented
|
||||
def IS_CHARACTER_JUNK(ch: _StrType, ws: _StrType = ...) -> bool: ... # ws is undocumented
|
||||
def IS_LINE_JUNK(line: str, pat: Any = ...) -> bool: ... # pat is undocumented
|
||||
def IS_CHARACTER_JUNK(ch: str, ws: str = ...) -> bool: ... # ws is undocumented
|
||||
def unified_diff(
|
||||
a: Sequence[_StrType],
|
||||
b: Sequence[_StrType],
|
||||
fromfile: _StrType = ...,
|
||||
tofile: _StrType = ...,
|
||||
fromfiledate: _StrType = ...,
|
||||
tofiledate: _StrType = ...,
|
||||
a: Sequence[str],
|
||||
b: Sequence[str],
|
||||
fromfile: str = ...,
|
||||
tofile: str = ...,
|
||||
fromfiledate: str = ...,
|
||||
tofiledate: str = ...,
|
||||
n: int = ...,
|
||||
lineterm: _StrType = ...,
|
||||
) -> Iterator[_StrType]: ...
|
||||
lineterm: str = ...,
|
||||
) -> Iterator[str]: ...
|
||||
def context_diff(
|
||||
a: Sequence[_StrType],
|
||||
b: Sequence[_StrType],
|
||||
fromfile: _StrType = ...,
|
||||
tofile: _StrType = ...,
|
||||
fromfiledate: _StrType = ...,
|
||||
tofiledate: _StrType = ...,
|
||||
a: Sequence[str],
|
||||
b: Sequence[str],
|
||||
fromfile: str = ...,
|
||||
tofile: str = ...,
|
||||
fromfiledate: str = ...,
|
||||
tofiledate: str = ...,
|
||||
n: int = ...,
|
||||
lineterm: _StrType = ...,
|
||||
) -> Iterator[_StrType]: ...
|
||||
lineterm: str = ...,
|
||||
) -> Iterator[str]: ...
|
||||
def ndiff(
|
||||
a: Sequence[_StrType], b: Sequence[_StrType], linejunk: Optional[_JunkCallback] = ..., charjunk: Optional[_JunkCallback] = ...
|
||||
) -> Iterator[_StrType]: ...
|
||||
a: Sequence[str], b: Sequence[str], linejunk: Optional[_JunkCallback] = ..., charjunk: Optional[_JunkCallback] = ...
|
||||
) -> Iterator[str]: ...
|
||||
|
||||
class HtmlDiff(object):
|
||||
def __init__(
|
||||
@@ -101,26 +99,26 @@ class HtmlDiff(object):
|
||||
) -> None: ...
|
||||
def make_file(
|
||||
self,
|
||||
fromlines: Sequence[_StrType],
|
||||
tolines: Sequence[_StrType],
|
||||
fromdesc: _StrType = ...,
|
||||
todesc: _StrType = ...,
|
||||
fromlines: Sequence[str],
|
||||
tolines: Sequence[str],
|
||||
fromdesc: str = ...,
|
||||
todesc: str = ...,
|
||||
context: bool = ...,
|
||||
numlines: int = ...,
|
||||
*,
|
||||
charset: str = ...,
|
||||
) -> _StrType: ...
|
||||
) -> str: ...
|
||||
def make_table(
|
||||
self,
|
||||
fromlines: Sequence[_StrType],
|
||||
tolines: Sequence[_StrType],
|
||||
fromdesc: _StrType = ...,
|
||||
todesc: _StrType = ...,
|
||||
fromlines: Sequence[str],
|
||||
tolines: Sequence[str],
|
||||
fromdesc: str = ...,
|
||||
todesc: str = ...,
|
||||
context: bool = ...,
|
||||
numlines: int = ...,
|
||||
) -> _StrType: ...
|
||||
) -> str: ...
|
||||
|
||||
def restore(delta: Iterable[_StrType], which: int) -> Iterator[_StrType]: ...
|
||||
def restore(delta: Iterable[str], which: int) -> Iterator[str]: ...
|
||||
def diff_bytes(
|
||||
dfunc: Callable[[Sequence[str], Sequence[str], str, str, str, str, int, str], Iterator[str]],
|
||||
a: Sequence[bytes],
|
||||
|
||||
Reference in New Issue
Block a user