Skip to content

Commit 0b31dfb

Browse files
committed
BUG: ensure return DateRange index from asfreq, GH #390
1 parent a3bbdf2 commit 0b31dfb

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

bench/zoo_bench.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ xts.bench <- function(){
3737

3838
fts.bench <- function(){
3939
x <- fts(rnorm(sz), sort(sample(indices, sz)))
40-
y <- fts(rnorm(sz), sort(sample(indices, sz)))
40+
y <- fts(rnorm(sz), sort(sample(indices, sz))
4141
timeit(function() {x + y})
4242
}
4343

pandas/core/frame.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,9 @@ def reindex(self, index=None, columns=None, method=None, copy=True):
12471247
def _reindex_index(self, new_index, method, copy):
12481248
if new_index.equals(self.index):
12491249
if copy:
1250-
return self.copy()
1250+
result = self.copy()
1251+
result.index = new_index
1252+
return result
12511253
else:
12521254
return self
12531255
new_data = self._data.reindex_axis(new_index, method, axis=1)

pandas/tests/test_frame.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -1935,10 +1935,20 @@ def test_asfreq(self):
19351935
result = zero_length.asfreq('EOM')
19361936
self.assert_(result is not zero_length)
19371937

1938+
def test_asfreq_DateRange(self):
1939+
from pandas.core.daterange import DateRange
1940+
df = DataFrame({'A': [1,2,3]},
1941+
index=[datetime(2011,11,01), datetime(2011,11,2),
1942+
datetime(2011,11,3)])
1943+
df = df.asfreq('WEEKDAY')
1944+
self.assert_(isinstance(df.index, DateRange))
1945+
1946+
ts = df['A'].asfreq('WEEKDAY')
1947+
self.assert_(isinstance(ts.index, DateRange))
1948+
19381949
def test_as_matrix(self):
19391950
frame = self.frame
19401951
mat = frame.as_matrix()
1941-
smallerCols = ['C', 'A']
19421952

19431953
frameCols = frame.columns
19441954
for i, row in enumerate(mat):

0 commit comments

Comments
 (0)