Skip to content

Fix Match.group problems #3172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srittau merged 5 commits into from
Aug 8, 2019
+11 −7
Merged

Fix Match.group problems #3172

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6379d79
Fix Match.group problems
srittau Aug 7, 2019
22fba26
Mark arguments as positional-only
srittau Aug 7, 2019
692dddb
Add overload for group 0
srittau Aug 7, 2019
318605c
Add missing @overload
srittau Aug 7, 2019
48bc000
Import Literal on Python < 3.8
srittau Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions stdlib/3/typing.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ from abc import abstractmethod, ABCMeta
from types import CodeType, FrameType, TracebackType
import collections # Needed by aliases like DefaultDict, see mypy issue 2986

if sys.version_info < (3, 8):
from typing_extensions import Literal

# Definitions of special type checking related constructs. Their definition
# are not used, so their value does not matter.

Expand Down Expand Up @@ -526,15 +529,16 @@ class Match(Generic[AnyStr]):
def expand(self, template: AnyStr) -> AnyStr: ...

@overload
def group(self, group1: int = ...) -> AnyStr: ...
@overload
def group(self, group1: str) -> AnyStr: ...
def group(self, __group: Literal[0] = ...) -> AnyStr: ...

@JelleZijlstra JelleZijlstra Aug 7, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing the @overload decorator

@overload
def group(self, group1: int, group2: int,
*groups: int) -> Sequence[AnyStr]: ...
def group(self, __group: Union[str, int]) -> Optional[AnyStr]: ...
@overload
def group(self, group1: str, group2: str,
*groups: str) -> Sequence[AnyStr]: ...
def group(
self,
__group1: Union[str, int],
__group2: Union[str, int],
*groups: Union[str, int],
) -> Tuple[Optional[AnyStr], ...]: ...

def groups(self, default: AnyStr = ...) -> Sequence[AnyStr]: ...
def groupdict(self, default: AnyStr = ...) -> dict[str, AnyStr]: ...
Expand Down