Skip to content

Commit e9dec0d

Browse files
committed
DOC: fix up DataFrame.from_csv docs. make up mind about default arguments, GH #274
1 parent dd3cd71 commit e9dec0d

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

pandas/core/frame.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -436,16 +436,19 @@ def from_csv(cls, path, header=0, sep=',', index_col=0,
436436
Field delimiter
437437
index_col : int or sequence, default 0
438438
Column to use for index. If a sequence is given, a MultiIndex
439-
is used.
439+
is used. Different default from read_table
440+
parse_dates : boolean, default True
441+
Parse dates. Different default from read_table
440442
441443
Notes
442444
-----
443-
Will attempt to convert index to datetimes for time series
444-
data. Use read_table for more options
445+
Preferable to use read_table for most general purposes but from_csv
446+
makes for an easy roundtrip to and from file, especially with a
447+
DataFrame of time series data
445448
446449
Returns
447450
-------
448-
y : DataFrame or DataFrame
451+
y : DataFrame
449452
"""
450453
from pandas.io.parsers import read_table
451454
return read_table(path, header=header, sep=sep,
@@ -469,9 +472,8 @@ def to_sparse(self, fill_value=None, kind='block'):
469472
default_kind=kind,
470473
default_fill_value=fill_value)
471474

472-
def to_csv(self, path, na_rep='', cols=None, header=True,
473-
index=True, index_label=None, mode='w', sep=",",
474-
nanRep=None):
475+
def to_csv(self, path, sep=",", na_rep='', cols=None, header=True,
476+
index=True, index_label=None, mode='w', nanRep=None):
475477
"""
476478
Write DataFrame to a comma-separated values (csv) file
477479
@@ -482,6 +484,7 @@ def to_csv(self, path, na_rep='', cols=None, header=True,
482484
nanRep : string, default ''
483485
Missing data rep'n
484486
cols : sequence, optional
487+
Columns to write
485488
header : boolean, default True
486489
Write out column names
487490
index : boolean, default True

0 commit comments

Comments
 (0)