Skip to content

Commit 6c03932

Browse files
author
Ben Kandel
committed
Address comments.
1 parent bfba946 commit 6c03932

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
lines changed

pandas/core/indexing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1463,7 +1463,7 @@ def _getitem_axis(self, key, axis=0):
14631463
not isinstance(key[0], tuple)):
14641464
if isinstance(key, ABCSeries):
14651465
# GH 14730
1466-
key = key.values.tolist()
1466+
key = list(key)
14671467
key = tuple([key])
14681468

14691469
# an iterable multi-selection

pandas/tests/indexes/test_multi.py

+1-14
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import pandas as pd
1414

15-
from pandas import (CategoricalIndex, DataFrame, Index, MultiIndex, Series,
15+
from pandas import (CategoricalIndex, DataFrame, Index, MultiIndex,
1616
compat, date_range, period_range)
1717
from pandas.compat import PY3, long, lrange, lzip, range, u
1818
from pandas.core.common import PerformanceWarning, UnsortedIndexError
@@ -346,19 +346,6 @@ def test_set_levels_labels_names_bad_input(self):
346346
with tm.assertRaisesRegexp(TypeError, 'string'):
347347
self.index.set_names(names, level=0)
348348

349-
def test_series_index(self):
350-
# GH14730
351-
index = MultiIndex.from_product([[1, 2, 3], ['A', 'B', 'C']])
352-
x = Series(index=index, data=range(9))
353-
y = Series([1, 3])
354-
expected = Series(
355-
data=[0, 1, 2, 6, 7, 8],
356-
index=MultiIndex.from_product([[1, 3], ['A', 'B', 'C']]))
357-
actual_from_series = x.loc[y]
358-
actual_from_list = x.loc[[1, 3]]
359-
tm.assert_series_equal(expected, actual_from_list)
360-
tm.assert_series_equal(expected, actual_from_series)
361-
362349
def test_set_levels_categorical(self):
363350
# GH13854
364351
index = MultiIndex.from_arrays([list("xyzx"), [0, 1, 2, 3]])

pandas/tests/test_multilevel.py

+19
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,25 @@ def test_getitem_partial(self):
690690
expected.columns = expected.columns.droplevel(0).droplevel(0)
691691
assert_frame_equal(result, expected)
692692

693+
def test_series_index(self):
694+
# GH14730
695+
index = MultiIndex.from_product([[1, 2, 3], ['A', 'B', 'C']])
696+
x = Series(index=index, data=range(9), dtype=np.float64)
697+
y = Series([1, 3])
698+
expected = Series(
699+
data=[0, 1, 2, 6, 7, 8],
700+
index=MultiIndex.from_product([[1, 3], ['A', 'B', 'C']]),
701+
dtype=np.float64)
702+
result = x.loc[y]
703+
result2 = x.loc[[1, 3]]
704+
tm.assert_series_equal(result, expected)
705+
tm.assert_series_equal(result2, expected)
706+
empty_series = Series(data=[], dtype=np.float64)
707+
expected2 = Series([], index=MultiIndex(
708+
levels=index.levels, labels=[[], []], dtype=np.float64))
709+
result3 = x.loc[empty_series]
710+
tm.assert_series_equal(result3, expected2)
711+
693712
def test_getitem_slice_not_sorted(self):
694713
df = self.frame.sortlevel(1).T
695714

0 commit comments

Comments
 (0)