Skip to content

Commit ae90f93

Browse files
committed
TST: GH4861 move changes to different test file
1 parent eecede1 commit ae90f93

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

pandas/tests/indexes/period/test_period.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from datetime import datetime
2-
31
import numpy as np
42
import pytest
53

@@ -572,20 +570,3 @@ def test_maybe_convert_timedelta():
572570
offset = offsets.BusinessDay()
573571
with pytest.raises(ValueError, match='freq'):
574572
pi._maybe_convert_timedelta(offset)
575-
576-
577-
def test_multiindex_period_datetime():
578-
# GH4861, using datetime in period of multiindex raises exception
579-
580-
idx1 = Index(['a', 'a', 'a', 'b', 'b'])
581-
idx2 = period_range('2012-01', periods=len(idx1), freq='M')
582-
s = Series(np.random.randn(len(idx1)), [idx1, idx2])
583-
584-
# try Period as index
585-
expected = s.iloc[0]
586-
result = s.loc['a', Period('2012-01')]
587-
assert result == expected
588-
589-
# try datetime as index
590-
result = s.loc['a', datetime(2012, 1, 1)]
591-
assert result == expected

pandas/tests/indexing/test_multiindex.py

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
from warnings import catch_warnings
22

3+
from datetime import datetime
4+
35
import numpy as np
46
import pytest
57

68
from pandas.errors import PerformanceWarning, UnsortedIndexError
79

810
import pandas as pd
911
from pandas import (
10-
DataFrame, Index, MultiIndex, Panel, Series, Timestamp, date_range)
12+
DataFrame, date_range, Index, MultiIndex, Panel, Period, period_range,
13+
Series, Timestamp)
1114
from pandas.tests.indexing.common import _mklbl
1215
from pandas.util import testing as tm
1316

@@ -1340,3 +1343,20 @@ def test_panel_setitem_with_multiindex(self):
13401343
p5.iloc[0, :, 0] = [1, 2]
13411344
expected = Panel(arr, **axes)
13421345
tm.assert_panel_equal(p5, expected)
1346+
1347+
1348+
def test_multiindex_period_datetime():
1349+
# GH4861, using datetime in period of multiindex raises exception
1350+
1351+
idx1 = Index(['a', 'a', 'a', 'b', 'b'])
1352+
idx2 = period_range('2012-01', periods=len(idx1), freq='M')
1353+
s = Series(np.random.randn(len(idx1)), [idx1, idx2])
1354+
1355+
# try Period as index
1356+
expected = s.iloc[0]
1357+
result = s.loc['a', Period('2012-01')]
1358+
assert result == expected
1359+
1360+
# try datetime as index
1361+
result = s.loc['a', datetime(2012, 1, 1)]
1362+
assert result == expected

0 commit comments

Comments
 (0)