[Python-checkins] python/nondist/sandbox/csv csv.py,1.16,1.17

[andrewmcnamara@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/csv
In directory sc8-pr-cvs1:/tmp/cvs-serv4371

Modified Files:
	csv.py 
Log Message:
Renamed CSVError back to Error, renamed writer methods as writerow and
writerows.


Index: csv.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/csv/csv.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** csv.py	3 Feb 2003 02:55:19 -0000	1.16
--- csv.py	3 Feb 2003 05:32:19 -0000	1.17
***************
*** 1,7 ****
  import _csv
! from _csv import Error as CSVError
  
  __all__ = [ "QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE",
!             "CSVError", "Dialect", "excel", "excel_tab", "reader", "writer",
              "register_dialect", "get_dialect", "list_dialects"]
  
--- 1,7 ----
  import _csv
! from _csv import Error
  
  __all__ = [ "QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE",
!             "Error", "Dialect", "excel", "excel_tab", "reader", "writer",
              "register_dialect", "get_dialect", "list_dialects"]
  
***************
*** 36,40 ****
                  dialect_obj = _dialects[dialect]
              except KeyError:
!                 raise CSVError('Unknown dialect')
          parser_options = {}
          for attr in dir(dialect_obj):
--- 36,40 ----
                  dialect_obj = _dialects[dialect]
              except KeyError:
!                 raise Error('Unknown dialect')
          parser_options = {}
          for attr in dir(dialect_obj):
***************
*** 65,69 ****
          _OCcsv.__init__(self, dialect, **options)
  
!     def write(self, fields):
          # if fields is a dict, we need a valid fieldnames list
          # if self.fieldnames is None we'll get a TypeError in the for stmt
--- 65,69 ----
          _OCcsv.__init__(self, dialect, **options)
  
!     def writerow(self, fields):
          # if fields is a dict, we need a valid fieldnames list
          # if self.fieldnames is None we'll get a TypeError in the for stmt
***************
*** 78,95 ****
          self.fileobj.write(self.parser.join(fields))
  
!     def writelines(self, lines):
          for fields in lines:
              self.write(fields)
-         
-     def close(self):
-         self.fileobj.close()
-         del self.fileobj
- 
-     def __del__(self):
-         if hasattr(self, 'fileobj'):
-             try:
-                 self.close()
-             except:
-                 pass
  
  def register_dialect(name, dialect):
--- 78,84 ----
          self.fileobj.write(self.parser.join(fields))
  
!     def writerows(self, lines):
          for fields in lines:
              self.write(fields)
  
  def register_dialect(name, dialect):