Skip to content

Commit 3a815d3

Browse files
committed
fixed using Pandas >= 1.0 (closes #845)
1 parent e6239d0 commit 3a815d3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

doc/source/changes/version_0_33.rst.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ Miscellaneous improvements
5656
Fixes
5757
^^^^^
5858

59-
* fixed something (closes :issue:`1`).
59+
* fixed using Pandas >= 1.0 (closes :issue:`845`).

larray/inout/pandas.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@ def index_to_labels(idx, sort=True):
3939
r"""
4040
Returns unique labels for each dimension.
4141
"""
42-
if isinstance(idx, pd.core.index.MultiIndex):
42+
if isinstance(idx, pd.MultiIndex):
4343
if sort:
4444
return list(idx.levels)
4545
else:
4646
return [list(unique(idx.get_level_values(l))) for l in range(idx.nlevels)]
4747
else:
48-
assert isinstance(idx, pd.core.index.Index)
48+
assert isinstance(idx, pd.Index)
4949
labels = list(idx.values)
5050
return [sorted(labels) if sort else labels]
5151

5252

5353
def cartesian_product_df(df, sort_rows=False, sort_columns=False, fill_value=nan, **kwargs):
5454
idx = df.index
5555
labels = index_to_labels(idx, sort=sort_rows)
56-
if isinstance(idx, pd.core.index.MultiIndex):
56+
if isinstance(idx, pd.MultiIndex):
5757
if sort_rows:
5858
new_index = pd.MultiIndex.from_product(labels)
5959
else:
@@ -118,14 +118,14 @@ def from_series(s, sort_rows=False, fill_value=nan, meta=None, **kwargs):
118118
a1 b0 4.0 5.0
119119
a1 b1 6.0 7.0
120120
"""
121-
if isinstance(s.index, pd.core.index.MultiIndex):
121+
if isinstance(s.index, pd.MultiIndex):
122122
# TODO: use argument sort=False when it will be available
123123
# (see https://github.com/pandas-dev/pandas/issues/15105)
124124
df = s.unstack(level=-1, fill_value=fill_value)
125125
# pandas (un)stack and pivot(_table) methods return a Dataframe/Series with sorted index and columns
126126
if not sort_rows:
127127
labels = index_to_labels(s.index, sort=False)
128-
if isinstance(df.index, pd.core.index.MultiIndex):
128+
if isinstance(df.index, pd.MultiIndex):
129129
index = pd.MultiIndex.from_tuples(list(product(*labels[:-1])), names=s.index.names[:-1])
130130
else:
131131
index = labels[0]

0 commit comments

Comments
 (0)