Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DOC: enable docstring on DataFrame.columns/index #20385

Merged
merged 4 commits into from
Mar 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions doc/source/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,11 @@ Constructor
Attributes
~~~~~~~~~~
**Axes**
* **index**: axis labels

.. autosummary::
:toctree: generated/

Series.index

.. autosummary::
:toctree: generated/
Expand Down Expand Up @@ -845,13 +849,15 @@ Attributes and underlying data
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
**Axes**

* **index**: row labels
* **columns**: column labels
.. autosummary::
:toctree: generated/

DataFrame.index
DataFrame.columns

.. autosummary::
:toctree: generated/

DataFrame.as_matrix
DataFrame.dtypes
DataFrame.ftypes
DataFrame.get_dtype_counts
Expand Down Expand Up @@ -2546,8 +2552,7 @@ objects.
:hidden:

generated/pandas.DataFrame.blocks
generated/pandas.DataFrame.columns
generated/pandas.DataFrame.index
generated/pandas.DataFrame.as_matrix
generated/pandas.DataFrame.ix
generated/pandas.Index.asi8
generated/pandas.Index.data
Expand All @@ -2566,6 +2571,5 @@ objects.
generated/pandas.Series.asobject
generated/pandas.Series.blocks
generated/pandas.Series.from_array
generated/pandas.Series.index
generated/pandas.Series.ix
generated/pandas.Timestamp.offset
9 changes: 6 additions & 3 deletions pandas/_libs/properties.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,22 @@ cache_readonly = CachedProperty


cdef class AxisProperty(object):
cdef:

cdef readonly:
Py_ssize_t axis
object __doc__

def __init__(self, axis=0):
def __init__(self, axis=0, doc=""):
self.axis = axis
self.__doc__ = doc

def __get__(self, obj, type):
cdef:
list axes

if obj is None:
# Only instances have _data, not classes
return None
return self
else:
axes = obj._data.axes
return axes[self.axis]
Expand Down
5 changes: 4 additions & 1 deletion pandas/core/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -6788,7 +6788,10 @@ def isin(self, values):


DataFrame._setup_axes(['index', 'columns'], info_axis=1, stat_axis=0,
axes_are_reversed=True, aliases={'rows': 0})
axes_are_reversed=True, aliases={'rows': 0},
docs={
'index': 'The index (row labels) of the DataFrame.',
'columns': 'The column labels of the DataFrame.'})
DataFrame._add_numeric_operations()
DataFrame._add_series_or_dataframe_operations()

Expand Down
4 changes: 2 additions & 2 deletions pandas/core/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def _constructor_expanddim(self):
@classmethod
def _setup_axes(cls, axes, info_axis=None, stat_axis=None, aliases=None,
slicers=None, axes_are_reversed=False, build_axes=True,
ns=None):
ns=None, docs=None):
"""Provide axes setup for the major PandasObjects.

Parameters
Expand Down Expand Up @@ -278,7 +278,7 @@ def _setup_axes(cls, axes, info_axis=None, stat_axis=None, aliases=None,
if build_axes:

def set_axis(a, i):
setattr(cls, a, properties.AxisProperty(i))
setattr(cls, a, properties.AxisProperty(i, docs.get(a, a)))
cls._internal_names_set.add(a)

if axes_are_reversed:
Expand Down
3 changes: 2 additions & 1 deletion pandas/core/panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -1523,7 +1523,8 @@ def _extract_axis(self, data, axis=0, intersect=False):
stat_axis=1, aliases={'major': 'major_axis',
'minor': 'minor_axis'},
slicers={'major_axis': 'index',
'minor_axis': 'columns'})
'minor_axis': 'columns'},
docs={})

ops.add_special_arithmetic_methods(Panel)
ops.add_flex_arithmetic_methods(Panel)
Expand Down
3 changes: 2 additions & 1 deletion pandas/core/series.py
Original file line number Diff line number Diff line change
Expand Up @@ -3809,7 +3809,8 @@ def to_period(self, freq=None, copy=True):
hist = gfx.hist_series


Series._setup_axes(['index'], info_axis=0, stat_axis=0, aliases={'rows': 0})
Series._setup_axes(['index'], info_axis=0, stat_axis=0, aliases={'rows': 0},
docs={'index': 'The index (axis labels) of the Series.'})
Series._add_numeric_operations()
Series._add_series_only_operations()
Series._add_series_or_dataframe_operations()
Expand Down
6 changes: 4 additions & 2 deletions pandas/tests/frame/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

# pylint: disable-msg=W0612,E1101
from copy import deepcopy
import pydoc
import sys
from distutils.version import LooseVersion

Expand Down Expand Up @@ -362,8 +363,9 @@ def test_axis_aliases(self):

def test_class_axis(self):
# https://github.com/pandas-dev/pandas/issues/18147
DataFrame.index # no exception!
DataFrame.columns # no exception!
# no exception and no empty docstring
assert pydoc.getdoc(DataFrame.index)
assert pydoc.getdoc(DataFrame.columns)

def test_more_values(self):
values = self.mixed_frame.values
Expand Down
4 changes: 3 additions & 1 deletion pandas/tests/series/test_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# coding=utf-8
# pylint: disable-msg=E1101,W0612
from collections import OrderedDict
import pydoc

import pytest

Expand Down Expand Up @@ -384,7 +385,8 @@ def test_axis_alias(self):

def test_class_axis(self):
# https://github.com/pandas-dev/pandas/issues/18147
Series.index # no exception!
# no exception and no empty docstring
assert pydoc.getdoc(Series.index)

def test_numpy_unique(self):
# it works!
Expand Down