Skip to content

Commit 5fd05d2

Browse files
committed
levels compat
1 parent e3e6f29 commit 5fd05d2

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

pandas/core/indexes/base.py

-5
Original file line numberDiff line numberDiff line change
@@ -1102,11 +1102,6 @@ def _assert_can_do_op(self, value):
11021102
def nlevels(self):
11031103
return 1
11041104

1105-
@property
1106-
def levels(self):
1107-
""" return a list my levels """
1108-
return [list(self)]
1109-
11101105
def _get_names(self):
11111106
return FrozenList((self.name, ))
11121107

pandas/core/window.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1881,15 +1881,15 @@ def dataframe_from_int_dict(data, frame_template):
18811881
# set the index and reorder
18821882
if arg2.columns.nlevels > 1:
18831883
result.index = MultiIndex.from_product(
1884-
arg2.columns.levels + result_index.levels)
1884+
arg2.columns.levels + [result_index])
18851885
result = result.reorder_levels([2, 0, 1]).sort_index()
18861886
else:
18871887
result.index = MultiIndex.from_product(
18881888
[range(len(arg2.columns)),
18891889
range(len(result_index))])
18901890
result = result.swaplevel(1, 0).sort_index()
18911891
result.index = MultiIndex.from_product(
1892-
result_index.levels + arg2.columns.levels)
1892+
[result_index] + [arg2.columns])
18931893
else:
18941894

18951895
# empty result

0 commit comments

Comments
 (0)