Skip to content

Commit 22918fb

Browse files
committed
fix mypy errors
1 parent 53817ef commit 22918fb

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

pandas/core/frame.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,13 @@
9292
from pandas.core.dtypes.missing import isna, notna
9393

9494
from pandas._typing import Axes, Dtype, FilePathOrBuffer
95-
from pandas.core import algorithms, common as com, groupby, nanops, ops
95+
from pandas.core import algorithms, common as com, nanops, ops
9696
from pandas.core.accessor import CachedAccessor
9797
from pandas.core.arrays import Categorical, ExtensionArray
9898
from pandas.core.arrays.datetimelike import DatetimeLikeArrayMixin as DatetimeLikeArray
9999
from pandas.core.arrays.sparse import SparseFrameAccessor
100100
from pandas.core.generic import NDFrame, _shared_docs
101+
from pandas.core.groupby import generic as grp_generic
101102
from pandas.core.indexes import base as ibase
102103
from pandas.core.indexes.api import Index, ensure_index, ensure_index_from_sequences
103104
from pandas.core.indexes.datetimes import DatetimeIndex
@@ -5582,13 +5583,13 @@ def groupby(
55825583
group_keys: bool = True,
55835584
squeeze: bool = False,
55845585
observed: bool = False,
5585-
) -> "groupby.DataFrameGroupBy":
5586+
) -> "grp_generic.DataFrameGroupBy":
55865587

55875588
if level is None and by is None:
55885589
raise TypeError("You have to supply one of 'by' and 'level'")
55895590
axis = self._get_axis_number(axis)
55905591

5591-
return groupby.DataFrameGroupBy(
5592+
return grp_generic.DataFrameGroupBy(
55925593
obj=self,
55935594
keys=by,
55945595
axis=axis,

pandas/core/reshape/merge.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
from pandas import Categorical, Index, MultiIndex
4343
from pandas._typing import FrameOrSeries
44+
from pandas.core import groupby
4445
import pandas.core.algorithms as algos
4546
from pandas.core.arrays.categorical import _recode_for_categories
4647
import pandas.core.common as com
@@ -113,6 +114,7 @@ def _groupby_and_merge(
113114
by = [by]
114115

115116
lby = left.groupby(by, sort=False)
117+
rby: Optional[groupby.DataFrameGroupBy] = None
116118

117119
# if we can groupby the rhs
118120
# then we can get vastly better perf
@@ -132,7 +134,7 @@ def _groupby_and_merge(
132134
try:
133135
rby = right.groupby(by, sort=False)
134136
except KeyError:
135-
rby = None
137+
pass
136138

137139
for key, lhs in lby:
138140

pandas/core/series.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
)
4848

4949
import pandas as pd
50-
from pandas.core import algorithms, base, generic, groupby, nanops, ops
50+
from pandas.core import algorithms, base, generic, nanops, ops
5151
from pandas.core.accessor import CachedAccessor
5252
from pandas.core.arrays import ExtensionArray, try_cast_to_ea
5353
from pandas.core.arrays.categorical import Categorical, CategoricalAccessor
@@ -59,6 +59,7 @@
5959
is_empty_data,
6060
sanitize_array,
6161
)
62+
from pandas.core.groupby import generic as grp_generic
6263
from pandas.core.indexers import maybe_convert_indices
6364
from pandas.core.indexes.accessors import CombinedDatetimelikeProperties
6465
from pandas.core.indexes.api import (
@@ -1630,13 +1631,13 @@ def groupby(
16301631
group_keys: bool = True,
16311632
squeeze: bool = False,
16321633
observed: bool = False,
1633-
) -> "groupby.SeriesGroupBy":
1634+
) -> "grp_generic.SeriesGroupBy":
16341635

16351636
if level is None and by is None:
16361637
raise TypeError("You have to supply one of 'by' and 'level'")
16371638
axis = self._get_axis_number(axis)
16381639

1639-
return groupby.SeriesGroupBy(
1640+
return grp_generic.SeriesGroupBy(
16401641
obj=self,
16411642
keys=by,
16421643
axis=axis,

0 commit comments

Comments
 (0)