[Python-checkins] python/nondist/sandbox/csv csv.py,1.5,1.6

[andrewmcnamara@users.sourceforge.net]

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

Modified Files:
	csv.py 
Log Message:
Give the dialect's a common Dialect base class, made the reader factor accept
an instance as dialect (as well as strings).
----------------------------------------------------------------------


Index: csv.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/csv/csv.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** csv.py	31 Jan 2003 04:07:40 -0000	1.5
--- csv.py	31 Jan 2003 06:25:08 -0000	1.6
***************
*** 3,7 ****
  QUOTE_MINIMAL, QUOTE_ALL, QUOTE_NONNUMERIC = range(3)
  
! class excel:
      quotechar = '"'
      delimiter = ','
--- 3,7 ----
  QUOTE_MINIMAL, QUOTE_ALL, QUOTE_NONNUMERIC = range(3)
  
! class Dialect:
      quotechar = '"'
      delimiter = ','
***************
*** 13,22 ****
      quoting = QUOTE_MINIMAL
  
  class excel_tab(excel):
      delimiter = '\t'
  
  dialects = {
!     'excel': excel,
!     'excel-tab': excel_tab,
  }
  
--- 13,25 ----
      quoting = QUOTE_MINIMAL
  
+ class excel(Dialect):
+     pass
+ 
  class excel_tab(excel):
      delimiter = '\t'
  
  dialects = {
!     'excel': excel(),
!     'excel-tab': excel_tab(),
  }
  
***************
*** 26,33 ****
  class OCcvs:
      def __init__(self, dialect, **options):
!         try:
!             dialect_obj = dialects[dialect]
!         except KeyError:
!             raise CSVError('Unknown dialect')
          parser_options = {}
          for attr in dir(dialect_obj):
--- 29,39 ----
  class OCcvs:
      def __init__(self, dialect, **options):
!         if isinstance(dialect, Dialect):
!             dialect_obj = dialect
!         else:
!             try:
!                 dialect_obj = dialects[dialect]
!             except KeyError:
!                 raise CSVError('Unknown dialect')
          parser_options = {}
          for attr in dir(dialect_obj):