From 3ed119c358519ab81b7b8559beaffe105bbfaea1 Mon Sep 17 00:00:00 2001 From: y-p Date: Thu, 11 Oct 2012 18:44:47 +0200 Subject: [PATCH 1/4] DOC: add caveat regarding the use of dicts as arg to read_csv() --- doc/source/io.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/source/io.rst b/doc/source/io.rst index 1494871b6262d..6567d47d94eb0 100644 --- a/doc/source/io.rst +++ b/doc/source/io.rst @@ -286,6 +286,13 @@ data columns: index_col=0) #index is the nominal column df +**Note**: When passing a dict as the `parse_dates` argument, the order of +the columns prepended is not guaranteed, because `dict` objects do not impose +an ordering on their keys. On Python 2.7+ you may use `collections.OrderedDict` +instead of a regular `dict` if this matters to you. Because of this, when using a +dict for 'parse_dates' in conjunction with the `index_col` argument, it's best to +specify `index_col` as a column label rather then as an index on the resulting frame. + Date Parsing Functions ~~~~~~~~~~~~~~~~~~~~~~ Finally, the parser allows you can specify a custom ``date_parser`` function to From ca7fd987faaa594012ca62cabffefad299da5724 Mon Sep 17 00:00:00 2001 From: y-p Date: Thu, 11 Oct 2012 18:52:59 +0200 Subject: [PATCH 2/4] DOC: grammer [ci skip] --- doc/source/dsintro.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/dsintro.rst b/doc/source/dsintro.rst index c6e919eb6096c..3c3c67092c8f1 100644 --- a/doc/source/dsintro.rst +++ b/doc/source/dsintro.rst @@ -26,7 +26,7 @@ objects. To get started, import numpy and load pandas into your namespace: randn = np.random.randn from pandas import * -Here is a basic tenet to keep in mind: **data alignment is intrinsic**. Link +Here is a basic tenet to keep in mind: **data alignment is intrinsic**. The link between labels and data will not be broken unless done so explicitly by you. We'll give a brief intro to the data structures, then consider all of the broad From 6af9c6046214e3e5739cfdef28bd8a862b134991 Mon Sep 17 00:00:00 2001 From: y-p Date: Fri, 12 Oct 2012 02:21:51 +0200 Subject: [PATCH 3/4] DOC: closes #1709, add link to iris data set --- doc/source/visualization.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/source/visualization.rst b/doc/source/visualization.rst index 3e7fa29806091..f4cbbe7a074a7 100644 --- a/doc/source/visualization.rst +++ b/doc/source/visualization.rst @@ -327,6 +327,8 @@ for Fourier series. By coloring these curves differently for each class it is possible to visualize data clustering. Curves belonging to samples of the same class will usually be closer together and form larger structures. +**Note**: The "Iris" dataset is available `here `__. + .. ipython:: python from pandas import read_csv @@ -440,6 +442,8 @@ forces acting on our sample are at an equilibrium) is where a dot representing our sample will be drawn. Depending on which class that sample belongs it will be colored differently. +**Note**: The "Iris" dataset is available `here `__. + .. ipython:: python from pandas import read_csv From 8298253c5fa7f33f578a6090bb45e45326d712c3 Mon Sep 17 00:00:00 2001 From: y-p Date: Wed, 17 Oct 2012 00:19:56 +0200 Subject: [PATCH 4/4] DOC: fix intersphinx ref to python doc in io.rst --- doc/source/io.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/io.rst b/doc/source/io.rst index 6567d47d94eb0..508f6076f075d 100644 --- a/doc/source/io.rst +++ b/doc/source/io.rst @@ -164,7 +164,7 @@ You can also use a list of columns to create a hierarchical index: The ``dialect`` keyword gives greater flexibility in specifying the file format. By default it uses the Excel dialect but you can specify either the dialect name -or a :class:``python:csv.Dialect`` instance. +or a :class:`python:csv.Dialect` instance. .. ipython:: python :suppress: