Skip to content

Commit 460f8d3

Browse files
committed
BUG: revert mpl hackaround
1 parent b7728c1 commit 460f8d3

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

pandas/tseries/period.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -872,10 +872,11 @@ def __getitem__(self, key):
872872

873873
result = arr_idx[key]
874874
if result.ndim > 1:
875-
values = PeriodIndex(result.squeeze(), name=self.name,
876-
freq=self.freq)
877-
values = np.asarray(list(values), dtype=object)
878-
return values.reshape(result.shape)
875+
# MPL kludge
876+
# values = np.asarray(list(values), dtype=object)
877+
# return values.reshape(result.shape)
878+
879+
return PeriodIndex(result, name=self.name, freq=self.freq)
879880

880881
return PeriodIndex(result, name=self.name, freq=self.freq)
881882

pandas/tseries/tests/test_period.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1099,8 +1099,8 @@ def test_getitem_ndim2(self):
10991099
idx = period_range('2007-01', periods=3, freq='M')
11001100

11011101
result = idx[:, None]
1102-
self.assert_(type(result) == np.ndarray)
1103-
self.assert_(isinstance(result[0, 0], Period))
1102+
# MPL kludge
1103+
self.assert_(type(result) == PeriodIndex)
11041104

11051105
def test_getitem_partial(self):
11061106
rng = period_range('2007-01', periods=50)

0 commit comments

Comments
 (0)