mirror of
https://github.com/davidhalter/typeshed.git
synced 2025-12-26 05:41:11 +08:00
Simplify and correct many numeric unions (#7906)
Unblocks PyCQA/flake8-pyi#222
This commit is contained in:
@@ -17,34 +17,34 @@ class FileList:
|
||||
def process_template_line(self, line: str) -> None: ...
|
||||
@overload
|
||||
def include_pattern(
|
||||
self, pattern: str, anchor: int | bool = ..., prefix: str | None = ..., is_regex: Literal[0, False] = ...
|
||||
self, pattern: str, anchor: bool | Literal[0, 1] = ..., prefix: str | None = ..., is_regex: Literal[0, False] = ...
|
||||
) -> bool: ...
|
||||
@overload
|
||||
def include_pattern(self, pattern: str | Pattern[str], *, is_regex: Literal[True, 1] = ...) -> bool: ...
|
||||
@overload
|
||||
def include_pattern(
|
||||
self, pattern: str | Pattern[str], anchor: int | bool = ..., prefix: str | None = ..., is_regex: int | bool = ...
|
||||
self, pattern: str | Pattern[str], anchor: bool | Literal[0, 1] = ..., prefix: str | None = ..., is_regex: int = ...
|
||||
) -> bool: ...
|
||||
@overload
|
||||
def exclude_pattern(
|
||||
self, pattern: str, anchor: int | bool = ..., prefix: str | None = ..., is_regex: Literal[0, False] = ...
|
||||
self, pattern: str, anchor: bool | Literal[0, 1] = ..., prefix: str | None = ..., is_regex: Literal[0, False] = ...
|
||||
) -> bool: ...
|
||||
@overload
|
||||
def exclude_pattern(self, pattern: str | Pattern[str], *, is_regex: Literal[True, 1] = ...) -> bool: ...
|
||||
@overload
|
||||
def exclude_pattern(
|
||||
self, pattern: str | Pattern[str], anchor: int | bool = ..., prefix: str | None = ..., is_regex: int | bool = ...
|
||||
self, pattern: str | Pattern[str], anchor: bool | Literal[0, 1] = ..., prefix: str | None = ..., is_regex: int = ...
|
||||
) -> bool: ...
|
||||
|
||||
def findall(dir: str = ...) -> list[str]: ...
|
||||
def glob_to_re(pattern: str) -> str: ...
|
||||
@overload
|
||||
def translate_pattern(
|
||||
pattern: str, anchor: int | bool = ..., prefix: str | None = ..., is_regex: Literal[False, 0] = ...
|
||||
pattern: str, anchor: bool | Literal[0, 1] = ..., prefix: str | None = ..., is_regex: Literal[False, 0] = ...
|
||||
) -> Pattern[str]: ...
|
||||
@overload
|
||||
def translate_pattern(pattern: str | Pattern[str], *, is_regex: Literal[True, 1] = ...) -> Pattern[str]: ...
|
||||
@overload
|
||||
def translate_pattern(
|
||||
pattern: str | Pattern[str], anchor: int | bool = ..., prefix: str | None = ..., is_regex: int | bool = ...
|
||||
pattern: str | Pattern[str], anchor: bool | Literal[0, 1] = ..., prefix: str | None = ..., is_regex: int = ...
|
||||
) -> Pattern[str]: ...
|
||||
|
||||
@@ -13,12 +13,12 @@ __all__ = ["clear_cache", "cmp", "dircmp", "cmpfiles", "DEFAULT_IGNORES"]
|
||||
DEFAULT_IGNORES: list[str]
|
||||
BUFSIZE: Literal[8192]
|
||||
|
||||
def cmp(f1: StrOrBytesPath, f2: StrOrBytesPath, shallow: int | bool = ...) -> bool: ...
|
||||
def cmp(f1: StrOrBytesPath, f2: StrOrBytesPath, shallow: bool | Literal[0, 1] = ...) -> bool: ...
|
||||
def cmpfiles(
|
||||
a: AnyStr | PathLike[AnyStr],
|
||||
b: AnyStr | PathLike[AnyStr],
|
||||
common: Iterable[AnyStr | PathLike[AnyStr]],
|
||||
shallow: int | bool = ...,
|
||||
shallow: bool | Literal[0, 1] = ...,
|
||||
) -> tuple[list[AnyStr], list[AnyStr], list[AnyStr]]: ...
|
||||
|
||||
class dircmp(Generic[AnyStr]):
|
||||
|
||||
@@ -118,7 +118,7 @@ class Fraction(Rational):
|
||||
@overload
|
||||
def __pow__(self, b: complex) -> complex: ...
|
||||
@overload
|
||||
def __rpow__(self, a: int | float | Fraction) -> float: ...
|
||||
def __rpow__(self, a: float | Fraction) -> float: ...
|
||||
@overload
|
||||
def __rpow__(self, a: complex) -> complex: ...
|
||||
def __pos__(self) -> Fraction: ...
|
||||
|
||||
@@ -70,7 +70,7 @@ class FTP:
|
||||
def getwelcome(self) -> str: ...
|
||||
def set_debuglevel(self, level: int) -> None: ...
|
||||
def debug(self, level: int) -> None: ...
|
||||
def set_pasv(self, val: bool | int) -> None: ...
|
||||
def set_pasv(self, val: bool | Literal[0, 1]) -> None: ...
|
||||
def sanitize(self, s: str) -> str: ...
|
||||
def putline(self, line: str) -> None: ...
|
||||
def putcmd(self, line: str) -> None: ...
|
||||
|
||||
@@ -18,7 +18,7 @@ _T4 = TypeVar("_T4")
|
||||
_T5 = TypeVar("_T5")
|
||||
_T6 = TypeVar("_T6")
|
||||
|
||||
_Step: TypeAlias = int | float | SupportsFloat | SupportsInt | SupportsIndex | SupportsComplex
|
||||
_Step: TypeAlias = SupportsFloat | SupportsInt | SupportsIndex | SupportsComplex
|
||||
|
||||
_Predicate: TypeAlias = Callable[[_T], object]
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@ if sys.version_info >= (3, 7):
|
||||
else:
|
||||
def format_string(f: _str, val: Any, grouping: bool = ...) -> _str: ...
|
||||
|
||||
def currency(val: int | float | Decimal, symbol: bool = ..., grouping: bool = ..., international: bool = ...) -> _str: ...
|
||||
def currency(val: float | Decimal, symbol: bool = ..., grouping: bool = ..., international: bool = ...) -> _str: ...
|
||||
def delocalize(string: _str) -> _str: ...
|
||||
def atof(string: _str, func: Callable[[_str], float] = ...) -> float: ...
|
||||
def atoi(string: _str) -> int: ...
|
||||
|
||||
@@ -68,7 +68,7 @@ class Random(_random.Random):
|
||||
def __init__(self, x: Any = ...) -> None: ...
|
||||
# Using other `seed` types is deprecated since 3.9 and removed in 3.11
|
||||
if sys.version_info >= (3, 9):
|
||||
def seed(self, a: int | float | str | bytes | bytearray | None = ..., version: int = ...) -> None: ... # type: ignore[override]
|
||||
def seed(self, a: float | str | bytes | bytearray | None = ..., version: int = ...) -> None: ... # type: ignore[override]
|
||||
else:
|
||||
def seed(self, a: Any = ..., version: int = ...) -> None: ...
|
||||
|
||||
|
||||
@@ -410,7 +410,11 @@ class _Screen(TurtleScreen):
|
||||
def __init__(self) -> None: ...
|
||||
# Note int and float are interpreted differently, hence the Union instead of just float
|
||||
def setup(
|
||||
self, width: int | float = ..., height: int | float = ..., startx: int | None = ..., starty: int | None = ...
|
||||
self,
|
||||
width: int | float = ..., # noqa: Y041
|
||||
height: int | float = ..., # noqa: Y041
|
||||
startx: int | None = ...,
|
||||
starty: int | None = ...,
|
||||
) -> None: ...
|
||||
def title(self, titlestring: str) -> None: ...
|
||||
def bye(self) -> None: ...
|
||||
|
||||
Reference in New Issue
Block a user