[Python-checkins] python/nondist/sandbox/csv libcsv.tex,1.10,1.11

2003年2月26日 12:15:47 -0800

Update of /cvsroot/python/python/nondist/sandbox/csv
In directory sc8-pr-cvs1:/tmp/cvs-serv23815
Modified Files:
	libcsv.tex 
Log Message:
make references to the input or output file-like object uniform
Index: libcsv.tex
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/csv/libcsv.tex,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** libcsv.tex	26 Feb 2003 19:25:16 -0000	1.10
--- libcsv.tex	26 Feb 2003 20:15:39 -0000	1.11
***************
*** 48,65 ****
 The \module{csv} module defines the following functions:

! \begin{funcdesc}{reader}{iterable\optional{,
 dialect=\code{'excel'}\optional{, fmtparam}}}
 Return a reader object which will iterate over lines in the given
! \var{csvfile}. An optional \var{dialect} parameter can be given
! which is used to define a set of parameters specific to a particular
! CSV dialect. The other optional \var{fmtparam} keyword arguments can
! be given to override individual formatting parameters in the current
 dialect. For more information about the dialect and formatting
 parameters, see section~\ref{fmt-params}, ``Dialects and Formatting
! Parameters'' for details of these parameters. All data read are
! returned as strings.
 \end{funcdesc}

! \begin{funcdesc}{writer}{fileobj\optional{,
 dialect=\code{'excel'}\optional{, fmtparam}}}
 Return a writer object responsible for converting the user's data into
--- 48,69 ----
 The \module{csv} module defines the following functions:

! \begin{funcdesc}{reader}{csvfile\optional{,
 dialect=\code{'excel'}\optional{, fmtparam}}}
 Return a reader object which will iterate over lines in the given
! {}\var{csvfile}. \var{csvfile} can be any object which supports the
! iterator protocol and returns a string each time its \method{next}
! method is called. An optional \var{dialect} parameter can be given
! which is used to define a set of parameters specific to a particular CSV
! dialect. The other optional {}\var{fmtparam} keyword arguments can be
! given to override individual formatting parameters in the current
 dialect. For more information about the dialect and formatting
 parameters, see section~\ref{fmt-params}, ``Dialects and Formatting
! Parameters'' for details of these parameters.
! 
! All data read are returned as strings. No automatic data type
! conversion is performed.
 \end{funcdesc}

! \begin{funcdesc}{writer}{csvfile\optional{,
 dialect=\code{'excel'}\optional{, fmtparam}}}
 Return a writer object responsible for converting the user's data into
***************
*** 102,108 ****
 The \module{csv} module defines the following classes:

! \begin{classdesc}{DictReader}{fileobj, fieldnames\optional{,
! restkey\optional{, restval\optional{,
! dialect=\code{'excel'}\optional{, fmtparam}}}}}
 Create an object which operates like a regular reader but maps the
 information read into a dict whose keys are given by the \var{fieldnames}
--- 106,114 ----
 The \module{csv} module defines the following classes:

! \begin{classdesc}{DictReader}{csvfile, fieldnames\optional{,
! restkey=\code{None}\optional{,
! 			 restval=\code{None}\optional{,
! dialect=\code{'excel'}\optional{,
! 			 fmtparam}}}}}
 Create an object which operates like a regular reader but maps the
 information read into a dict whose keys are given by the \var{fieldnames}
***************
*** 117,121 ****

! \begin{classdesc}{DictWriter}{fileobj, fieldnames\optional{,
 restval=""\optional{,
 extrasaction=\code{'raise'}\optional{,
--- 123,127 ----

! \begin{classdesc}{DictWriter}{csvfile, fieldnames\optional{,
 restval=""\optional{,
 extrasaction=\code{'raise'}\optional{,
***************
*** 124,128 ****
 onto output rows. The \var{fieldnames} parameter identifies the order in
 which values in the dictionary passed to the \method{writerow()} method are
! written to the \var{fileobj}. The optional \var{restval} parameter
 specifies the value to be written if the dictionary is missing a key in
 \var{fieldnames}. If the dictionary passed to the \method{writerow()}
--- 130,134 ----
 onto output rows. The \var{fieldnames} parameter identifies the order in
 which values in the dictionary passed to the \method{writerow()} method are
! written to the \var{csvfile}. The optional \var{restval} parameter
 specifies the value to be written if the dictionary is missing a key in
 \var{fieldnames}. If the dictionary passed to the \method{writerow()}