Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
46bf318
typing
arw2019 Dec 9, 2020
eba7251
typing
arw2019 Dec 11, 2020
1a45267
typing
arw2019 Dec 11, 2020
f5cb185
typing
arw2019 Dec 11, 2020
4c9b764
review comments
arw2019 Dec 11, 2020
a273e5c
review comment
arw2019 Dec 13, 2020
e0558c5
review comment
arw2019 Dec 13, 2020
e156caa
merge master
arw2019 Dec 14, 2020
13ff245
merge master
arw2019 Dec 14, 2020
617e228
revert hints to pivot_table
arw2019 Dec 14, 2020
9a4d187
take out merge
arw2019 Dec 14, 2020
77e1142
minimize diff
arw2019 Dec 14, 2020
2352e45
fix eval return type annotation
arw2019 Dec 14, 2020
a3b7b1b
merge master
arw2019 Dec 14, 2020
1c942fd
review comments
arw2019 Dec 15, 2020
0e747dd
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
arw2019 Dec 15, 2020
11247d9
review comments
arw2019 Dec 21, 2020
d82d81e
merge master
arw2019 Dec 21, 2020
56ee7c4
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
arw2019 Dec 27, 2020
168cad2
review comments
arw2019 Jan 5, 2021
e12ed2e
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
arw2019 Jan 5, 2021
6c876ff
review comments
arw2019 Jan 5, 2021
0e780ce
review comments
arw2019 Jan 5, 2021
a93489a
review: remove NpDtype usage
arw2019 Jan 6, 2021
2cd6823
merge master
arw2019 Jan 6, 2021
3e39e44
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
arw2019 Jan 10, 2021
a28deaf
merge master
arw2019 Feb 11, 2021
9243c6b
merge master
arw2019 Feb 21, 2021
58fcad8
typing
arw2019 Feb 21, 2021
ff317d3
restore return type for memory_usage
arw2019 Feb 22, 2021
02647b5
remove return type for _series
arw2019 Feb 22, 2021
cc517a5
rogue comma
arw2019 Feb 22, 2021
666533c
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
arw2019 Feb 22, 2021
5d08d71
Merge remote-tracking branch 'upstream/master' into typing-frame
simonjayhawkins Mar 14, 2021
3b52fc9
Merge remote-tracking branch 'upstream/master' into typing-frame
simonjayhawkins Mar 15, 2021
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
review comments
  • Loading branch information
arw2019 committed Jan 5, 2021
commit 168cad26dbee00fb9670b8e9304d6c826378097a
13 changes: 4 additions & 9 deletions pandas/core/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
from pandas._libs.lib import no_default
from pandas._typing import (
AggFuncType,
AnyArrayLike,
ArrayLike,
Axes,
Axis,
Expand Down Expand Up @@ -1073,7 +1072,7 @@ def iterrows(self) -> Iterable[Tuple[Label, Series]]:

def itertuples(
self, index: bool = True, name: Optional[str] = "Pandas"
) -> Iterable[Tuple]:
) -> Iterable[Tuple[Any, ...]]:
"""
Iterate over DataFrame rows as namedtuples.

Expand Down Expand Up @@ -1163,7 +1162,7 @@ def __len__(self) -> int:
"""
return len(self.index)

def dot(self, other: Union[AnyArrayLike, FrameOrSeriesUnion]) -> FrameOrSeriesUnion:
def dot(self, other):
"""
Compute the matrix multiplication between the DataFrame and other.

Expand Down Expand Up @@ -1273,17 +1272,13 @@ def dot(self, other: Union[AnyArrayLike, FrameOrSeriesUnion]) -> FrameOrSeriesUn
else: # pragma: no cover
raise TypeError(f"unsupported type: {type(other)}")

def __matmul__(
self, other: Union[AnyArrayLike, FrameOrSeriesUnion]
) -> FrameOrSeriesUnion:
def __matmul__(self, other):
"""
Matrix multiplication using binary `@` operator in Python>=3.5.
"""
return self.dot(other)

def __rmatmul__(
self, other: Union[AnyArrayLike, FrameOrSeriesUnion]
) -> FrameOrSeriesUnion:
def __rmatmul__(self, other):
"""
Matrix multiplication using binary `@` operator in Python>=3.5.
"""
Expand Down