mirror of
https://github.com/davidhalter/typeshed.git
synced 2025-12-07 20:54:28 +08:00
Changed all regular expression findall() to return list[Any]. Findall() can return both list[AnyStr] and list[Tuple[AnyStr, AnyStr]]. (#269)
This commit is contained in:
committed by
Guido van Rossum
parent
8ee3123e02
commit
82b9baed3b
@@ -6,7 +6,7 @@
|
||||
|
||||
from typing import (
|
||||
List, Iterator, overload, Callable, Tuple, Sequence, Dict,
|
||||
Generic, AnyStr, Match, Pattern
|
||||
Generic, AnyStr, Match, Pattern, Any
|
||||
)
|
||||
|
||||
# ----- re variables and constants -----
|
||||
@@ -51,9 +51,9 @@ def split(pattern: Pattern[AnyStr], string: AnyStr,
|
||||
maxsplit: int = ..., flags: int = ...) -> List[AnyStr]: ...
|
||||
|
||||
@overload
|
||||
def findall(pattern: AnyStr, string: AnyStr, flags: int = ...) -> List[AnyStr]: ...
|
||||
def findall(pattern: AnyStr, string: AnyStr, flags: int = ...) -> List[Any]: ...
|
||||
@overload
|
||||
def findall(pattern: Pattern[AnyStr], string: AnyStr, flags: int = ...) -> List[AnyStr]: ...
|
||||
def findall(pattern: Pattern[AnyStr], string: AnyStr, flags: int = ...) -> List[Any]: ...
|
||||
|
||||
# Return an iterator yielding match objects over all non-overlapping matches
|
||||
# for the RE pattern in string. The string is scanned left-to-right, and
|
||||
|
||||
@@ -300,7 +300,7 @@ class Pattern(Generic[AnyStr]):
|
||||
endpos: int = ...) -> Match[AnyStr]: ...
|
||||
def split(self, string: AnyStr, maxsplit: int = ...) -> list[AnyStr]: ...
|
||||
def findall(self, string: AnyStr, pos: int = ...,
|
||||
endpos: int = ...) -> list[AnyStr]: ...
|
||||
endpos: int = ...) -> list[Any]: ...
|
||||
def finditer(self, string: AnyStr, pos: int = ...,
|
||||
endpos: int = ...) -> Iterator[Match[AnyStr]]: ...
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
from typing import (
|
||||
List, Iterator, overload, Callable, Tuple, Sequence, Dict,
|
||||
Generic, AnyStr, Match, Pattern
|
||||
Generic, AnyStr, Match, Pattern, Any
|
||||
)
|
||||
|
||||
# ----- re variables and constants -----
|
||||
@@ -52,9 +52,9 @@ def split(pattern: Pattern[AnyStr], string: AnyStr,
|
||||
maxsplit: int = ..., flags: int = ...) -> List[AnyStr]: ...
|
||||
|
||||
@overload
|
||||
def findall(pattern: AnyStr, string: AnyStr, flags: int = ...) -> List[AnyStr]: ...
|
||||
def findall(pattern: AnyStr, string: AnyStr, flags: int = ...) -> List[Any]: ...
|
||||
@overload
|
||||
def findall(pattern: Pattern[AnyStr], string: AnyStr, flags: int = ...) -> List[AnyStr]: ...
|
||||
def findall(pattern: Pattern[AnyStr], string: AnyStr, flags: int = ...) -> List[Any]: ...
|
||||
|
||||
# Return an iterator yielding match objects over all non-overlapping matches
|
||||
# for the RE pattern in string. The string is scanned left-to-right, and
|
||||
|
||||
@@ -377,7 +377,7 @@ class Pattern(Generic[AnyStr]):
|
||||
endpos: int = ...) -> Match[AnyStr]: ...
|
||||
def split(self, string: AnyStr, maxsplit: int = ...) -> list[AnyStr]: ...
|
||||
def findall(self, string: AnyStr, pos: int = ...,
|
||||
endpos: int = ...) -> list[AnyStr]: ...
|
||||
endpos: int = ...) -> list[Any]: ...
|
||||
def finditer(self, string: AnyStr, pos: int = ...,
|
||||
endpos: int = ...) -> Iterator[Match[AnyStr]]: ...
|
||||
|
||||
|
||||
Reference in New Issue
Block a user