*** /var/folders/5q/5qTPn6xq2RaWqk+1Ytw3-U+++TI/-Tmp-/ediff9GAUJE	Sun Jan 23 16:19:01 2011
--- /Users/skip/src/python/py3k/Doc/library/csv.rst	Sun Jan 23 16:18:41 2011
***************
*** 52,58 ****
     *csvfile* can be any object which supports the :term:`iterator` protocol and returns a
     string each time its :meth:`!__next__` method is called --- :term:`file objects
     <file object>` and list objects are both suitable.   If *csvfile* is a file object,
!    it should be opened with ``newline=''``. [#]_  An optional
     *dialect* parameter can be given which is used to define a set of parameters
     specific to a particular CSV dialect.  It may be an instance of a subclass of
     the :class:`Dialect` class or one of the strings returned by the
--- 52,58 ----
     *csvfile* can be any object which supports the :term:`iterator` protocol and returns a
     string each time its :meth:`!__next__` method is called --- :term:`file objects
     <file object>` and list objects are both suitable.   If *csvfile* is a file object,
!    it must be opened with ``newline=''``. [#]_  An optional
     *dialect* parameter can be given which is used to define a set of parameters
     specific to a particular CSV dialect.  It may be an instance of a subclass of
     the :class:`Dialect` class or one of the strings returned by the
***************
*** 79,85 ****
  
     Return a writer object responsible for converting the user's data into delimited
     strings on the given file-like object.  *csvfile* can be any object with a
!    :func:`write` method.  An optional *dialect*
     parameter can be given which is used to define a set of parameters specific to a
     particular CSV dialect.  It may be an instance of a subclass of the
     :class:`Dialect` class or one of the strings returned by the
--- 79,86 ----
  
     Return a writer object responsible for converting the user's data into delimited
     strings on the given file-like object.  *csvfile* can be any object with a
!    :func:`write` method.  If *csvfile* is a file object,
!    it must be opened with ``newline=''``. [#]_  An optional *dialect*
     parameter can be given which is used to define a set of parameters specific to a
     particular CSV dialect.  It may be an instance of a subclass of the
     :class:`Dialect` class or one of the strings returned by the