Skip to content

Commit 7448b96

Browse files
author
Carlos Souza
committed
Fixing scalar input
1 parent a080b9b commit 7448b96

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

pandas/core/generic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3980,7 +3980,7 @@ def asof(self, where, subset=None):
39803980
return pd.DataFrame(np.nan, index=where,
39813981
columns=self.columns)
39823982
else:
3983-
return pd.Series(np.nan, index=[where])
3983+
return pd.Series(np.nan, index=self.columns)
39843984

39853985
locs = self.index.asof_locs(where, ~(nulls.values))
39863986

pandas/tests/frame/test_asof.py

+12-3
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,16 @@ def test_all_nans(self):
9999
tm.assert_frame_equal(result, expected)
100100

101101
# testing scalar input
102-
date = date_range('1/1/1990', periods=self.N * 3, freq='25s')[0]
103-
result = DataFrame(np.nan, index=self.rng, columns=['A']).asof(date)
104-
expected = Series(np.nan, index=[date])
102+
result = DataFrame(np.nan, index=[1, 2], columns=['A', 'B']).asof([3])
103+
expected = DataFrame(np.nan, index=[3], columns=['A', 'B'])
104+
tm.assert_frame_equal(result, expected)
105+
106+
result = DataFrame(np.nan, index=[1, 2], columns=['A', 'B']).asof(3)
107+
expected = Series(np.nan, index=['A', 'B'])
105108
tm.assert_series_equal(result, expected)
109+
110+
111+
112+
113+
114+

0 commit comments

Comments
 (0)