Skip to content

Issue35925 remove trailing commas #35956

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.

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 8 commits into from
Aug 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions pandas/core/internals/concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@


def concatenate_block_managers(
mgrs_indexers, axes, concat_axis: int, copy: bool,
mgrs_indexers, axes, concat_axis: int, copy: bool
) -> BlockManager:
"""
Concatenate block managers into one.
Expand Down Expand Up @@ -76,7 +76,7 @@ def concatenate_block_managers(
b = make_block(values, placement=placement, ndim=blk.ndim)
else:
b = make_block(
_concatenate_join_units(join_units, concat_axis, copy=copy,),
_concatenate_join_units(join_units, concat_axis, copy=copy),
placement=placement,
)
blocks.append(b)
Expand Down Expand Up @@ -339,7 +339,7 @@ def _concatenate_join_units(join_units, concat_axis, copy):
# 2D to put it a non-EA Block
concat_values = np.atleast_2d(concat_values)
else:
concat_values = concat_compat(to_concat, axis=concat_axis,)
concat_values = concat_compat(to_concat, axis=concat_axis)

return concat_values

Expand Down
8 changes: 3 additions & 5 deletions pandas/core/internals/managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ def get_axe(block, qs, axes):
values = values.take(indexer)

return SingleBlockManager(
make_block(values, ndim=1, placement=np.arange(len(values))), axes[0],
make_block(values, ndim=1, placement=np.arange(len(values))), axes[0]
)

def isna(self, func) -> "BlockManager":
Expand Down Expand Up @@ -519,9 +519,7 @@ def where(
def setitem(self, indexer, value) -> "BlockManager":
return self.apply("setitem", indexer=indexer, value=value)

def putmask(
self, mask, new, align: bool = True, axis: int = 0,
):
def putmask(self, mask, new, align: bool = True, axis: int = 0):
transpose = self.ndim == 2

if align:
Expand Down Expand Up @@ -1923,7 +1921,7 @@ def _compare_or_regex_search(
"""

def _check_comparison_types(
result: Union[ArrayLike, bool], a: ArrayLike, b: Union[Scalar, Pattern],
result: Union[ArrayLike, bool], a: ArrayLike, b: Union[Scalar, Pattern]
):
"""
Raises an error if the two arrays (a,b) cannot be compared.
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/internals/ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


BlockPairInfo = namedtuple(
"BlockPairInfo", ["lvals", "rvals", "locs", "left_ea", "right_ea", "rblk"],
"BlockPairInfo", ["lvals", "rvals", "locs", "left_ea", "right_ea", "rblk"]
)


Expand Down
2 changes: 1 addition & 1 deletion pandas/core/nanops.py
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ def _zero_out_fperr(arg):

@disallow("M8", "m8")
def nancorr(
a: np.ndarray, b: np.ndarray, method="pearson", min_periods: Optional[int] = None,
a: np.ndarray, b: np.ndarray, method="pearson", min_periods: Optional[int] = None
):
"""
a, b: ndarrays
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/ops/docstrings.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def _make_flex_doc(op_name, typ):
base_doc = _flex_doc_SERIES
if op_desc["reverse"]:
base_doc += _see_also_reverse_SERIES.format(
reverse=op_desc["reverse"], see_also_desc=op_desc["see_also_desc"],
reverse=op_desc["reverse"], see_also_desc=op_desc["see_also_desc"]
)
doc_no_examples = base_doc.format(
desc=op_desc["desc"],
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/reshape/concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ def get_result(self):
mgrs_indexers.append((obj._mgr, indexers))

new_data = concatenate_block_managers(
mgrs_indexers, self.new_axes, concat_axis=self.bm_axis, copy=self.copy,
mgrs_indexers, self.new_axes, concat_axis=self.bm_axis, copy=self.copy
)
if not self.copy:
new_data._consolidate_inplace()
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/reshape/pivot.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def _add_margins(

elif values:
marginal_result_set = _generate_marginal_results(
table, data, values, rows, cols, aggfunc, observed, margins_name,
table, data, values, rows, cols, aggfunc, observed, margins_name
)
if not isinstance(marginal_result_set, tuple):
return marginal_result_set
Expand Down Expand Up @@ -308,7 +308,7 @@ def _compute_grand_margin(data, values, aggfunc, margins_name: str = "All"):


def _generate_marginal_results(
table, data, values, rows, cols, aggfunc, observed, margins_name: str = "All",
table, data, values, rows, cols, aggfunc, observed, margins_name: str = "All"
):
if len(cols) > 0:
# need to "interleave" the margins
Expand Down
8 changes: 3 additions & 5 deletions pandas/core/reshape/reshape.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ class _Unstacker:
unstacked : DataFrame
"""

def __init__(
self, index: MultiIndex, level=-1, constructor=None,
):
def __init__(self, index: MultiIndex, level=-1, constructor=None):

if constructor is None:
constructor = DataFrame
Expand Down Expand Up @@ -422,7 +420,7 @@ def unstack(obj, level, fill_value=None):
if is_extension_array_dtype(obj.dtype):
return _unstack_extension_series(obj, level, fill_value)
unstacker = _Unstacker(
obj.index, level=level, constructor=obj._constructor_expanddim,
obj.index, level=level, constructor=obj._constructor_expanddim
)
return unstacker.get_result(
obj.values, value_columns=None, fill_value=fill_value
Expand All @@ -436,7 +434,7 @@ def _unstack_frame(obj, level, fill_value=None):
return obj._constructor(mgr)
else:
return _Unstacker(
obj.index, level=level, constructor=obj._constructor,
obj.index, level=level, constructor=obj._constructor
).get_result(obj._values, value_columns=obj.columns, fill_value=fill_value)


Expand Down