Skip to content

Commit 28c3d9a

Browse files
committed
DOC/TST: revised indexing section in docs
updated whatsnew all tests work DOC: changes suggested by Jan Schulz revised whatsnew to include mostly references to new indexing
1 parent 7cc64d6 commit 28c3d9a

File tree

11 files changed

+470
-395
lines changed

11 files changed

+470
-395
lines changed

RELEASE.rst

+8-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ pandas 0.11.0
3535
Yahoo! finance (GH2795_)
3636
- Add ``squeeze`` function to reduce dimensionality of 1-len objects
3737
- Support slicing with time objects (GH2681_)
38-
- Add ``.iloc`` attribute, to support location-based indexing, analagous to ``.ix``
38+
- Added ``.iloc`` attribute, to support strict integer based indexing, analagous to ``.ix`` (GH2922_)
39+
- Added ``.loc`` attribute, to support strict label based indexing, analagous to ``.ix``
40+
- Added ``.iat`` attribute, to support fast scalar access via integers (replaces ``iget_value/iset_value``)
41+
- Added ``.at`` attribute, to support fast scalar access via labels (replaces ``get_value/set_value``)
42+
- Moved functionaility from ``irow,icol,iget_value/iset_value`` to ``.iloc`` indexer
43+
(via ``_ixs`` methods in each object)
3944

4045
**Improvements to existing features**
4146

@@ -52,6 +57,7 @@ pandas 0.11.0
5257
- ``describe_option()`` now reports the default and current value of options.
5358
- Add ``format`` option to ``pandas.to_datetime`` with faster conversion of
5459
strings that can be parsed with datetime.strptime
60+
- Add ``axes`` property to ``Series`` for compatibility
5561

5662
**API Changes**
5763

@@ -129,6 +135,7 @@ pandas 0.11.0
129135
- Bug in argsort of ``datetime64[ns]`` Series with ``NaT`` (GH2967_)
130136
- Bug in idxmin/idxmax of ``datetime64[ns]`` Series with ``NaT`` (GH2982__)
131137
- ``icol`` with negative indicies was return ``nan`` (see GH2922_)
138+
- Bug in ``icol`` with negative indicies was incorrect producing incorrect return values (see GH2922_)
132139

133140
.. _GH622: https://github.com/pydata/pandas/issues/622
134141
.. _GH797: https://github.com/pydata/pandas/issues/797

doc/source/conf.py

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# add these directories to sys.path here. If the directory is relative to the
1818
# documentation root, use os.path.abspath to make it absolute, like shown here.
1919
# sys.path.append(os.path.abspath('.'))
20-
sys.path.insert(0,'/home/jreback/pandas')
2120
sys.path.insert(0, os.path.abspath('../sphinxext'))
2221

2322
sys.path.extend([

doc/source/dsintro.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,8 @@ The basics of indexing are as follows:
437437
:widths: 30, 20, 10
438438

439439
Select column, ``df[col]``, Series
440-
Select row by label, ``df.xs(label)`` or ``df.ix[label]``, Series
441-
Select row by location (int), ``df.ix[loc]``, Series
440+
Select row by label, ``df.loc[label]``, Series
441+
Select row by integer location, ``df.iloc[loc]``, Series
442442
Slice rows, ``df[5:10]``, DataFrame
443443
Select rows by boolean vector, ``df[bool_vec]``, DataFrame
444444

@@ -447,8 +447,8 @@ DataFrame:
447447

448448
.. ipython:: python
449449
450-
df.xs('b')
451-
df.ix[2]
450+
df.loc('b')
451+
df.iloc[2]
452452
453453
For a more exhaustive treatment of more sophisticated label-based indexing and
454454
slicing, see the :ref:`section on indexing <indexing>`. We will address the
@@ -475,7 +475,7 @@ row-wise. For example:
475475

476476
.. ipython:: python
477477
478-
df - df.ix[0]
478+
df - df.iloc[0]
479479
480480
In the special case of working with time series data, if the Series is a
481481
TimeSeries (which it will be automatically if the index contains datetime
@@ -592,7 +592,7 @@ DataFrame in tabular form, though it won't always fit the console width:
592592

593593
.. ipython:: python
594594
595-
print baseball.ix[-20:, :12].to_string()
595+
print baseball.iloc[-20:, :12].to_string()
596596
597597
New since 0.10.0, wide DataFrames will now be printed across multiple rows by
598598
default:

0 commit comments

Comments
 (0)