Skip to content

Commit

Permalink
fix issue pandas-dev#21654
Browse files Browse the repository at this point in the history
  • Loading branch information
elmq0022 committed Jul 22, 2018
1 parent 0828c25 commit 768adf2
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 220 deletions.
2 changes: 1 addition & 1 deletion doc/source/whatsnew/v0.24.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ Missing
MultiIndex
^^^^^^^^^^

-
- Removing legacy MultiIndex internal formats
-
-

Expand Down
25 changes: 0 additions & 25 deletions pandas/core/indexes/multi.py
Original file line number Diff line number Diff line change
Expand Up @@ -824,15 +824,6 @@ def values(self):
self._tuples = lib.fast_zip(values)
return self._tuples

# fml
@property
def _is_v1(self):
return False

@property
def _is_v2(self):
return False

@property
def _has_complex_internals(self):
# to disable groupby tricks
Expand Down Expand Up @@ -2843,22 +2834,6 @@ def delete(self, loc):
return MultiIndex(levels=self.levels, labels=new_labels,
names=self.names, verify_integrity=False)

get_major_bounds = slice_locs

__bounds = None

@property
def _bounds(self):
"""
Return or compute and return slice points for level 0, assuming
sortedness
"""
if self.__bounds is None:
inds = np.arange(len(self.levels[0]))
self.__bounds = self.labels[0].searchsorted(inds)

return self.__bounds

def _wrap_joined_index(self, joined, other):
names = self.names if self.names == other.names else None
return MultiIndex.from_tuples(joined, names=names)
Expand Down
Binary file removed pandas/tests/indexes/multi/data/mindex_073.pickle
Binary file not shown.
149 changes: 0 additions & 149 deletions pandas/tests/indexes/multi/data/multiindex_v1.pickle

This file was deleted.

45 changes: 2 additions & 43 deletions pandas/tests/indexes/multi/test_conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
import numpy as np
import pandas as pd
import pandas.util.testing as tm
import pytest
from pandas import DataFrame, MultiIndex, date_range
from pandas.compat import PY3, range
from pandas.util.testing import assert_almost_equal
from pandas.compat import range


def test_tolist(idx):
Expand Down Expand Up @@ -93,46 +91,6 @@ def test_to_hierarchical():
assert result.names == index.names


@pytest.mark.skipif(PY3, reason="testing legacy pickles not support on py3")
def test_legacy_pickle(datapath):

path = datapath('indexes', 'multi', 'data', 'multiindex_v1.pickle')
obj = pd.read_pickle(path)

obj2 = MultiIndex.from_tuples(obj.values)
assert obj.equals(obj2)

res = obj.get_indexer(obj)
exp = np.arange(len(obj), dtype=np.intp)
assert_almost_equal(res, exp)

res = obj.get_indexer(obj2[::-1])
exp = obj.get_indexer(obj[::-1])
exp2 = obj2.get_indexer(obj2[::-1])
assert_almost_equal(res, exp)
assert_almost_equal(exp, exp2)


def test_legacy_v2_unpickle(datapath):

# 0.7.3 -> 0.8.0 format manage
path = datapath('indexes', 'multi', 'data', 'mindex_073.pickle')
obj = pd.read_pickle(path)

obj2 = MultiIndex.from_tuples(obj.values)
assert obj.equals(obj2)

res = obj.get_indexer(obj)
exp = np.arange(len(obj), dtype=np.intp)
assert_almost_equal(res, exp)

res = obj.get_indexer(obj2[::-1])
exp = obj.get_indexer(obj[::-1])
exp2 = obj2.get_indexer(obj2[::-1])
assert_almost_equal(res, exp)
assert_almost_equal(exp, exp2)


def test_roundtrip_pickle_with_tz():

# GH 8367
Expand All @@ -146,6 +104,7 @@ def test_roundtrip_pickle_with_tz():


def test_pickle(indices):

unpickled = tm.round_trip_pickle(indices)
assert indices.equals(unpickled)
original_name, indices.name = indices.name, 'foo'
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/indexes/multi/test_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ def test_insert(idx):
tm.assert_series_equal(left, right)


def test_bounds(idx):
idx._bounds
# def test_bounds(idx):
# idx._bounds


def test_append(idx):
Expand Down

0 comments on commit 768adf2

Please sign in to comment.