8000 Merge remote-tracking branch 'upstream/master' into multi-index-join · pandas-dev/pandas@2d61a12 · GitHub
[go: up one dir, main page]
Skip to content
Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2d61a12

Browse files
harisbalharisbal
committed
Merge remote-tracking branch 'upstream/master' into multi-index-join
2 parents b581789 + 40dfadd commit 2d61a12

File tree

5 files changed

+7
-507
lines changed

5 files changed

+7
-507
lines changed

‎ci/appveyor-27.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎ci/appveyor-36.yaml

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎ci/travis-35-osx.yaml

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎pandas/core/indexes/base.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3940,10 +3940,11 @@ def _join_multi(self, other, how, return_indexers=True):
39403940
self_is_mi = isinstance(self, MultiIndex)
39413941
other_is_mi = isinstance(other, MultiIndex)
39423942

3943-
# figure out join names
3944-
self_names = com._not_none(*self.names)
3945-
other_names = com._not_none(*other.names)
3946-
overlap = list(set(self_names) & set(other_names))
3943+
if self_is_mi and other_is_mi:
3944+
3945+
# Drop the non matching levels
3946+
ldrop_levels = list(set(self_names) - set(overlap))
3947+
rdrop_levels = list(set(other_names) - set(overlap))
39473948

39483949
self_jnlevels = self.droplevel(ldrop_levels)
39493950
other_jnlevels = other.droplevel(rdrop_levels)

0 commit comments

Comments
 (0)
0