From 47f02225aefa37a2d5190e1f756d4ceb62b24090 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Tue, 9 Feb 2016 18:51:20 -0500 Subject: [PATCH] DOC: cleanup str changes in whatsnew --- doc/source/whatsnew/v0.18.0.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/source/whatsnew/v0.18.0.txt b/doc/source/whatsnew/v0.18.0.txt index d30c0321568bc..8fa28fa422f64 100644 --- a/doc/source/whatsnew/v0.18.0.txt +++ b/doc/source/whatsnew/v0.18.0.txt @@ -145,15 +145,15 @@ Changes to str.extract The :ref:`.str.extract ` method takes a regular expression with capture groups, finds the first match in each subject string, and returns the contents of the capture groups -(:issue:`11386`). In v0.18.0, the ``expand`` argument was added to -``extract``. When ``expand=False`` it returns a ``Series``, ``Index``, -or ``DataFrame``, depending on the subject and regular expression -pattern (same behavior as pre-0.18.0). When ``expand=True`` it always -returns a ``DataFrame``, which is more consistent and less confusing -from the perspective of a user. Currently the default is -``expand=None`` which gives a ``FutureWarning`` and uses -``expand=False``. To avoid this warning, please explicitly specify -``expand``. +(:issue:`11386`). + +In v0.18.0, the ``expand`` argument was added to +``extract``. + +- ``expand=False``: it returns a ``Series``, ``Index``, or ``DataFrame``, depending on the subject and regular expression pattern (same behavior as pre-0.18.0). +- ``expand=True``: it always returns a ``DataFrame``, which is more consistent and less confusing from the perspective of a user. + +Currently the default is ``expand=None`` which gives a ``FutureWarning`` and uses ``expand=False``. To avoid this warning, please explicitly specify ``expand``. .. ipython:: python @@ -205,6 +205,9 @@ In summary, ``extract(expand=True)`` always returns a ``DataFrame`` with a row for every subject string, and a column for every capture group. +Addition of str.extractall +^^^^^^^^^^^^^^^^^^^^^^^^^^ + .. _whatsnew_0180.enhancements.extractall: The :ref:`.str.extractall ` method was added