Skip to content

Commit

Permalink
Merge pull request pandas-dev#7721 from cpcloud/period-index-docstring
Browse files Browse the repository at this point in the history
DOC: docstring for PeriodIndex
  • Loading branch information
cpcloud committed Jul 10, 2014
2 parents 7707a20 + abc6ca4 commit 20dfc6b
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions pandas/tseries/period.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import pandas.lib as lib
import pandas.tslib as tslib
import pandas.algos as _algos
from pandas.compat import map, zip, u
from pandas.compat import zip, u


#---------------
Expand Down Expand Up @@ -546,13 +546,13 @@ class PeriodIndex(DatetimeIndexOpsMixin, Int64Index):
end : end value, period-like, optional
If periods is none, generated index will extend to first conforming
period on or just past end argument
year : int or array, default None
month : int or array, default None
quarter : int or array, default None
day : int or array, default None
hour : int or array, default None
minute : int or array, default None
second : int or array, default None
year : int, array, or Series, default None
month : int, array, or Series, default None
quarter : int, array, or Series, default None
day : int, array, or Series, default None
hour : int, array, or Series, default None
minute : int, array, or Series, default None
second : int, array, or Series, default None
tz : object, default None
Timezone for converting datetime64 data to Periods
Expand Down

0 comments on commit 20dfc6b

Please sign in to comment.