Skip to content

REF: de-duplicate _wrap_joined_index in MultiIndex #36313

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 36 commits into from
Sep 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
4c5eddd
REF: remove unnecesary try/except
jbrockmendel Aug 21, 2020
c632c9f
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Aug 21, 2020
9e64be3
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Aug 21, 2020
42649fb
TST: add test for agg on ordered categorical cols (#35630)
mathurk1 Aug 21, 2020
47121dd
TST: resample does not yield empty groups (#10603) (#35799)
tkmz-n Aug 21, 2020
1decb3e
revert accidental rebase
jbrockmendel Aug 22, 2020
57c5dd3
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 22, 2020
a358463
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 23, 2020
ffa7ad7
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 23, 2020
e5e98d4
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 24, 2020
408db5a
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 24, 2020
d3493cf
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 25, 2020
75a805a
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 25, 2020
9f61070
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 25, 2020
2d10f6e
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 26, 2020
3e20187
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 26, 2020
e27d07f
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 27, 2020
c52bed4
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 27, 2020
b69d4d7
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 28, 2020
1c5f8fd
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 28, 2020
061c9e2
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 28, 2020
0129a83
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 30, 2020
4d0d8e8
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 30, 2020
715848f
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 30, 2020
01f9c50
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 31, 2020
5f4f7dc
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 31, 2020
4f1f4e1
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 31, 2020
aa7d119
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 31, 2020
1f783d1
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 31, 2020
7def723
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Sep 1, 2020
1c24499
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Sep 1, 2020
df4de64
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Sep 1, 2020
af88c43
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Sep 1, 2020
165208f
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Sep 11, 2020
02cc9e7
Merge branch 'master' of https://github.com/pandas-dev/pandas into co…
jbrockmendel Sep 12, 2020
54df9fb
REF: de-duplicate _wrap_joined_index
jbrockmendel Sep 12, 2020
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
5 changes: 4 additions & 1 deletion pandas/core/indexes/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -3876,7 +3876,10 @@ def _join_monotonic(self, other, how="left", return_indexers=False):
return join_index

def _wrap_joined_index(self, joined, other):
name = get_op_result_name(self, other)
if isinstance(self, ABCMultiIndex):
name = self.names if self.names == other.names else None
else:
name = get_op_result_name(self, other)
Copy link
Contributor

Choose a reason for hiding this comment

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

hmm why can't we do this in get_op_result_name?

Copy link
Member Author

Choose a reason for hiding this comment

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

i considered that, decided against it because it meant additional overhead in a lot of places

Copy link
Contributor

Choose a reason for hiding this comment

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

kk

return self._constructor(joined, name=name)

# --------------------------------------------------------------------
Expand Down
25 changes: 21 additions & 4 deletions pandas/core/indexes/multi.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from functools import wraps
from sys import getsizeof
from typing import (
TYPE_CHECKING,
Expand Down Expand Up @@ -152,6 +153,25 @@ def _codes_to_ints(self, codes):
return np.bitwise_or.reduce(codes, axis=1)


def names_compat(meth):
Copy link
Contributor

Choose a reason for hiding this comment

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

type if you can

"""
A decorator to allow either `name` or `names` keyword but not both.

This makes it easier to share code with base class.
"""

@wraps(meth)
def new_meth(self_or_cls, *args, **kwargs):
if "name" in kwargs and "names" in kwargs:
raise TypeError("Can only provide one of `names` and `name`")
elif "name" in kwargs:
kwargs["names"] = kwargs.pop("name")

return meth(self_or_cls, *args, **kwargs)

return new_meth


class MultiIndex(Index):
"""
A multi-level, or hierarchical, index object for pandas objects.
Expand Down Expand Up @@ -449,6 +469,7 @@ def from_arrays(cls, arrays, sortorder=None, names=lib.no_default) -> "MultiInde
)

@classmethod
@names_compat
def from_tuples(
cls,
tuples,
Expand Down Expand Up @@ -3635,10 +3656,6 @@ def delete(self, loc):
verify_integrity=False,
)

def _wrap_joined_index(self, joined, other):
names = self.names if self.names == other.names else None
return self._constructor(joined, names=names)

@doc(Index.isin)
def isin(self, values, level=None):
if level is None:
Expand Down