From b5a2f6536a6adc1b659c2f51d7db409a3ae40c72 Mon Sep 17 00:00:00 2001 From: Paul Reidy Date: Thu, 4 Jan 2018 20:30:13 +0000 Subject: [PATCH 1/2] DOC: Add information on kind parameter to resample docstring --- pandas/core/generic.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 1ab7c50d86c98..a0bfab2c16cb6 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -5724,6 +5724,10 @@ def resample(self, rule, how=None, axis=0, fill_method=None, closed=None, convention : {'start', 'end', 's', 'e'} For PeriodIndex only, controls whether to use the start or end of `rule` + kind: {'timestamp', 'period'}, optional + Pass 'timestamp' to convert the resulting index to a + ``DateTimeIndex`` or 'period' to convert it to a ``PeriodIndex``. + By default the input representation is retained. loffset : timedelta Adjust the resampled time labels base : int, default 0 From 9da1997f5bc3ef9e28763547901eb1b319418ca3 Mon Sep 17 00:00:00 2001 From: Paul Reidy Date: Thu, 4 Jan 2018 20:37:45 +0000 Subject: [PATCH 2/2] pep8 --- pandas/core/generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index a0bfab2c16cb6..2b5e4b912247e 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -5725,7 +5725,7 @@ def resample(self, rule, how=None, axis=0, fill_method=None, closed=None, For PeriodIndex only, controls whether to use the start or end of `rule` kind: {'timestamp', 'period'}, optional - Pass 'timestamp' to convert the resulting index to a + Pass 'timestamp' to convert the resulting index to a ``DateTimeIndex`` or 'period' to convert it to a ``PeriodIndex``. By default the input representation is retained. loffset : timedelta