Skip to content

fix arguments for merge #61

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
merged 1 commit into from
May 20, 2021
Merged

fix arguments for merge #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions pandas/core/reshape/merge.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ from pandas import DataFrame as DataFrame, Series as Series
from pandas._typing import Label
from typing import Optional, Sequence, Union

def merge(left: DataFrame,
def merge(left: Union[DataFrame, Series],
right: Union[DataFrame, Series],
how: str = ...,
on: Optional[Union[Label, Sequence]] = ...,
Expand All @@ -17,7 +17,7 @@ def merge(left: DataFrame,
indicator: Union[bool, str] = ...,
validate: str = ...) -> DataFrame: ...

def merge_ordered(left: DataFrame,
def merge_ordered(left: Union[DataFrame, Series],
right: Union[DataFrame, Series],
on: Optional[Union[Label, Sequence]] = ...,
left_on: Optional[Union[Label, Sequence]] = ...,
Expand All @@ -29,8 +29,8 @@ def merge_ordered(left: DataFrame,
how: str = ...) -> DataFrame: ...

def merge_asof(
left: DataFrame,
right: DataFrame, Series,
left: Union[DataFrame, Series],
right: Union[DataFrame, Series],
on: Optional[Label] = ...,
left_on: Optional[Label] = ...,
right_on: Optional[Label] = ...,
Expand Down