[Python-checkins] python/nondist/sandbox/csv csv.py,1.14,1.15

2003年2月02日 18:54:32 -0800

Update of /cvsroot/python/python/nondist/sandbox/csv
In directory sc8-pr-cvs1:/tmp/cvs-serv30709
Modified Files:
	csv.py 
Log Message:
define the public API with __all__
remove the OCcsv class from the public API
Index: csv.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/csv/csv.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** csv.py	3 Feb 2003 02:52:04 -0000	1.14
--- csv.py	3 Feb 2003 02:54:30 -0000	1.15
***************
*** 2,5 ****
--- 2,9 ----
 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"]
+ 
 QUOTE_MINIMAL, QUOTE_ALL, QUOTE_NONNUMERIC, QUOTE_NONE = range(4)

***************
*** 24,28 ****
 }

! class OCcsv:
 def __init__(self, dialect, **options):
 if isinstance(dialect, Dialect):
--- 28,32 ----
 }

! class _OCcsv:
 def __init__(self, dialect, **options):
 if isinstance(dialect, Dialect):
***************
*** 41,48 ****
 self.parser = _csv.parser(**parser_options)

! class reader(OCcsv):
 def __init__(self, iterobj, dialect = 'excel', **options):
 self.iterobj = iter(iterobj)
! OCcsv.__init__(self, dialect, **options)

 def __iter__(self):
--- 45,52 ----
 self.parser = _csv.parser(**parser_options)

! class reader(_OCcsv):
 def __init__(self, iterobj, dialect = 'excel', **options):
 self.iterobj = iter(iterobj)
! _OCcsv.__init__(self, dialect, **options)

 def __iter__(self):
***************
*** 55,63 ****
 return fields

! class writer(OCcsv):
 def __init__(self, fileobj, dialect='excel', fieldnames=None, **options):
 self.fileobj = fileobj
 self.fieldnames = fieldnames
! OCcsv.__init__(self, dialect, **options)

 def write(self, fields):
--- 59,67 ----
 return fields

! class writer(_OCcsv):
 def __init__(self, fileobj, dialect='excel', fieldnames=None, **options):
 self.fileobj = fileobj
 self.fieldnames = fieldnames
! _OCcsv.__init__(self, dialect, **options)

 def write(self, fields):