Skip to content

Commit 7397472

Browse files
committed
ENH: pandas-dev#14591 - formatting
1 parent 76d5a14 commit 7397472

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

pandas/core/generic.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -4054,7 +4054,8 @@ def groupby(self, by=None, axis=0, level=None, as_index=True, sort=True,
40544054
sort=sort, group_keys=group_keys, squeeze=squeeze,
40554055
**kwargs)
40564056

4057-
def asfreq(self, freq, method=None, how=None, normalize=False, fill_value=None):
4057+
def asfreq(self, freq, method=None, how=None, normalize=False,
4058+
fill_value=None):
40584059
"""
40594060
Convert TimeSeries to specified frequency.
40604061
@@ -4089,7 +4090,8 @@ def asfreq(self, freq, method=None, how=None, normalize=False, fill_value=None):
40894090
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
40904091
"""
40914092
from pandas.tseries.resample import asfreq
4092-
return asfreq(self, freq, method=method, how=how, normalize=normalize, fill_value=fill_value)
4093+
return asfreq(self, freq, method=method, how=how, normalize=normalize,
4094+
fill_value=fill_value)
40934095

40944096
def at_time(self, time, asof=False):
40954097
"""

pandas/tseries/tests/test_resample.py

+6-8
Original file line numberDiff line numberDiff line change
@@ -368,16 +368,14 @@ def test_fill_value(self):
368368
ts2 = pd.Series(np.random.rand(len(rng)), index=rng)
369369
df = pd.DataFrame({'one': ts, 'two': ts2})
370370

371-
# upsample to get NaN values
372-
ts_up = ts.resample('1S').asfreq()
373-
df_up = df.resample('1S').asfreq()
371+
# insert pre-existing missing value
372+
df.loc['2016-01-01 00:00:08', 'two'] = None
374373

375-
expected_ts = ts_up.fillna(2).resample('2S').sum()
376-
actual_ts = ts_up.resample('2S', fill_value=2).sum()
377-
assert_series_equal(expected_ts, actual_ts)
374+
actual_df = df.resample('1S').asfreq(fill_value=9.0)
375+
376+
expected_df = df.resample('1S').asfreq().fillna(9.0)
377+
expected_df.loc['2016-01-01 00:00:08', 'two'] = None
378378

379-
expected_df = df_up.fillna(1.5).resample('2S').sum()
380-
actual_df = df_up.resample('2S', fill_value=1.5).sum()
381379
assert_frame_equal(expected_df, actual_df)
382380

383381
def test_apply_without_aggregation(self):

0 commit comments

Comments
 (0)